]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:45:00 +0000 (12:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:45:00 +0000 (12:45 +1000)
commit8569f2e08fc36c1135fc198675990e22e1a8788f
tree4c36f6af2c7f6d8bf9d70016dcfac22e12ecc76b
parentcde64bd0f19ca7e9fcfb6b679be1c6529418c627
parent63c99722768222f32293ac8c969c4cfdf6964547
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/boot/dts/r8a73a4.dtsi
arch/arm/boot/dts/r8a7790.dtsi