]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68k/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:13:19 +0000 (11:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:13:19 +0000 (11:13 +1000)
commit6567d1964ca8649979d733055a2ca69e7ec5d881
tree784195fc72bd9a4e7aaba85cecd1d67d43649893
parenta1006a3feb5c14bb671915d33cd4cb00914f7557
parent365afba47a89bbb19a725724cc823ef70fd343cc
Merge remote-tracking branch 'm68k/for-next'

Conflicts:
arch/cris/arch-v32/drivers/Kconfig
arch/cris/Kconfig
arch/cris/arch-v32/drivers/Kconfig