]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 21 Oct 2012 23:12:04 +0000 (10:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 21 Oct 2012 23:12:06 +0000 (10:12 +1100)
commitb3de0a8c3609123f28a9dedc2606d9b23f72c26a
tree5b8dc522069f3f18d147eadca3094d144c2a0f63
parent138b28b674465923220f3a52668b4282b6cd1c79
parent4dbfd6dc5d9253516db17967c378c86b8bc5f6d3
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/include/asm/termios.h
arch/m68k/include/uapi/asm/auxvec.h
arch/m68k/include/uapi/asm/msgbuf.h
arch/m68k/include/uapi/asm/sembuf.h
arch/m68k/include/uapi/asm/shmbuf.h
arch/m68k/include/uapi/asm/socket.h
arch/m68k/include/uapi/asm/sockios.h
arch/m68k/include/uapi/asm/termbits.h
arch/m68k/include/asm/Kbuild
arch/m68k/include/uapi/asm/Kbuild