]> 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, 20 Dec 2011 23:46:20 +0000 (10:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 23:46:20 +0000 (10:46 +1100)
commitdad8e316987e627f2f7b51f3c99cd0ab79e1c600
tree6160153053c94e3a798d50f2802648f63a60e771
parentb6b650f77948a50e937ec4916f9e6f004b232f4b
parent4a7c080c3e53e9e0a29b3d7e2ef5a65fb0d94d92
Merge remote-tracking branch 'm68knommu/for-next'

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