]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/dt-scif-for-v3.16' into next
authorSimon Horman <horms+renesas@verge.net.au>
Wed, 14 May 2014 00:57:26 +0000 (09:57 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 14 May 2014 00:57:26 +0000 (09:57 +0900)
commit2a3bd7497db17158c3826afc9910886d59982039
treec966d710af359924deec62c03b0bd72647b30adb
parent92d4913a93991841c62270487c6774231b6b025e
parent5ba55fa81aee9493928c245f142a0bfe9f32d02f
Merge branch 'heads/dt-scif-for-v3.16' into next

Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts
arch/arm/boot/dts/r8a7790-lager.dts
arch/arm/boot/dts/r8a7791-koelsch.dts
arch/arm/mach-shmobile/board-koelsch-reference.c
arch/arm/mach-shmobile/setup-r8a7790.c
arch/arm/mach-shmobile/setup-r8a7791.c