]> 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, 30 Nov 2011 01:05:12 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:05:12 +0000 (12:05 +1100)
commit3b3fff7ef742e13f8ccde7506f95af94e0cf44f8
tree43d8779d9fe0a4ac62b87d1fed51f8b9eda878b9
parent7878bde6cebc7fc0f8c16aeeeb660eaf204ff1e1
parent285aa9405cdcd9c98dd85a9a664af040d9f228f5
Merge remote-tracking branch 'm68knommu/for-next'

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