diff options
| author | Linus Torvalds | 2012-10-22 08:54:24 +0300 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-22 08:54:24 +0300 |
| commit | 4fe7e866a7d43479ac8d8a610023a9c9275f488f (patch) | |
| tree | 8fa9c00514dc09cc34fd4bcfecba04ce46ad636f /arch/m68k/include/asm/mac_iop.h | |
| 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
Diffstat (limited to 'arch/m68k/include/asm/mac_iop.h')
0 files changed, 0 insertions, 0 deletions