]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:14:56 +0000 (11:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:14:56 +0000 (11:14 +1100)
commit4d709f200a7685362bdc0644ac80b0260a99fa99
treeff9078940d8952e2e5443e8bab8a7bb575cfcaa3
parenta5fadeb519ca58a22f5f12890ba3ff4b8a15d1b5
parent8de5bbddc892751d616c8a8bfbe6457b7f3f7c80
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig
arch/m68k/kernel/Makefile
arch/m68k/Kconfig
arch/m68k/kernel/Makefile
arch/m68k/kernel/entry_mm.S