]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 00:19:39 +0000 (11:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 00:19:39 +0000 (11:19 +1100)
commit36a0c0d66e4c1946dd44a786d290a81134f5a75d
tree22e1571d5e5c86f1a3d385c4ebf0aeebd5bd4df4
parent1acaea507271994906463e9113804721385f1222
parent285aa9405cdcd9c98dd85a9a664af040d9f228f5
Merge remote-tracking branch 'm68knommu/for-next'

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