]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68k/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:50:31 +0000 (10:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:50:31 +0000 (10:50 +1000)
commit90b337a6f2799aee047bdc4f7b668c2eb46369f5
tree7f0c90e04a8918b36341347b86504c6292739df2
parent619f4d60cff1fb74e5cd8f632c2cdcbba94c607e
parent40d1f31505d81f2e87c893babfec93a1c27bc064
Merge remote-tracking branch 'm68k/for-next'

Conflicts:
arch/cris/arch-v32/drivers/Kconfig
arch/cris/Kconfig
arch/cris/arch-v32/drivers/Kconfig
drivers/staging/media/solo6x10/Kconfig