]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 23:58:27 +0000 (10:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 23:58:28 +0000 (10:58 +1100)
commite29794758169ad5b6859c4ece70aecdd6edc2f11
tree9570f5b17d439271b1c2c6f86e18d86b78472f6f
parenta050118cad883193783949d3f2d5717ba868de16
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