| commit | 4fe7e866a7d43479ac8d8a610023a9c9275f488f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 22 08:54:24 2012 +0300 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 22 08:54:24 2012 +0300 |
| tree | 8fa9c00514dc09cc34fd4bcfecba04ce46ad636f | |
| parent | 4a215aade0baa0487d4644d7aef6f166c84c516e [diff] | |
| parent | 8a745ee13fbbbead62fd7d3a3c15a270b1901d63 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k Pull m68k updates from Geert Uytterhoeven: "Just the expected UAPI disintegration and the "new" kcmp syscall." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Wire up kcmp m68k: Remove empty #ifdef/#else/#endif block UAPI: (Scripted) Disintegrate arch/m68k/include/asm