]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:57:50 +0000 (10:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:57:50 +0000 (10:57 +1100)
commit35ddf95f4dd1ce2bf8fdcd3e9bc2af25c35b7a88
treee02c81875bee5ef2ae85bedd74c2c358e3888fab
parentf7d231299abc932fc1f36a10fe7a53766beed873
parent4a7c080c3e53e9e0a29b3d7e2ef5a65fb0d94d92
Merge remote-tracking branch 'm68knommu/for-next'

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