]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:10:36 +0000 (12:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:10:36 +0000 (12:10 +1100)
commitde57a6ffc412f10ea0953529bba23369eff88b79
treef19942ebafcb04e965cd832061d577b36dbb85a7
parent454963c64056115d63d0b3f360f845426af22889
parent4a7c080c3e53e9e0a29b3d7e2ef5a65fb0d94d92
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.debug
arch/m68k/Kconfig.debug