]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cris/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:16:28 +0000 (10:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:16:28 +0000 (10:16 +1000)
commit642393cf4834df5938adc1b580874f527a0b9285
tree890aa269b8a83138600a6a22853a53f3ff9787a6
parent9758b9e64fbc9e9589342c96ff8c7f5a88da7ed1
parent32ade6a282a36aae1803b190bae452f1e46f6b6c
Merge remote-tracking branch 'cris/for-next'

Conflicts:
arch/cris/arch-v32/drivers/Kconfig
arch/cris/Kconfig
arch/cris/arch-v10/drivers/Kconfig
arch/cris/arch-v32/drivers/Kconfig
arch/cris/include/asm/processor.h