]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcm2835/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 05:09:34 +0000 (16:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 05:09:34 +0000 (16:09 +1100)
commitc3e50e5bd3d567cbbcec371d979dafc22ac71c3a
tree11d8920482c064709e33f8cc7abf53a411ebfe7f
parentaf99ac0e1fc3fce81e914c2185ca64255c8afee9
parentd1a77074f97841544f64e56d45102b14f4bc3e37
Merge remote-tracking branch 'bcm2835/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/bcm2835.dtsi