| commit | 01ed875a12eacd5ece370b20ccf8f51543feb172 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Jan 2011 23:02:55 +0000 (26 09:02 +1000) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Jan 2011 23:02:55 +0000 (26 09:02 +1000) | ||
| tree | f999e0050439dc8e958351f43ec0545191a2a206 | treesnapshot (tar.gz zip) |
| parent | 8348ad7c178627a302d579906096108b02052730 | commitdiff |
| parent | 5df1abdbd37af2ae317a1c5b5944173284dc55d6 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/amiga: Fix "debug=mem"
m68k/atari: Rename "scc" to "atari_scc"
m68k: Uninline strchr()
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/amiga: Fix "debug=mem"
m68k/atari: Rename "scc" to "atari_scc"
m68k: Uninline strchr()