]> 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, 15 Nov 2011 23:10:08 +0000 (10:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:10:08 +0000 (10:10 +1100)
commit5237344aefddd2c2c51a5ab3d32f26e908d6bb01
tree08f3056d059fdd7424fa5f59116d7b82b38630ce
parent4331979ce7cfd7ebed495ad554fbc41345c15141
parentbd329de9993020cc8f188a29b2eb3c1e4ac6fcad
Merge remote-tracking branch 'm68knommu/for-next'

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