]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ec801b a5176e0)
Merge branch 'heads/r7s72100-ccf-for-v3.16' into next
authorSimon Horman <horms+renesas@verge.net.au>
Sat, 17 May 2014 00:15:27 +0000 (09:15 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Sat, 17 May 2014 00:15:27 +0000 (09:15 +0900)
commitd1b3562bcdfe020ae4507bfe66cdad17ac7eef0d
tree261d5e1f43e27b1ae02a531e2fd2dbbee4e74147tree | snapshot
parent7ec801bbf7fb5d1827edbf13906d6effca9d314fcommit | diff
parenta5176e0d9de31a54e08468f21c15dc08e006857fcommit | diff
Merge branch 'heads/r7s72100-ccf-for-v3.16' into next

Conflicts:
arch/arm/boot/dts/Makefile

This conflict was resolved by:

CONFIG_ARCH_SHMOBILE_LEGACY hunk:
* Remove emev2-kzm9d.dtb
* Remove r7s72100-genmai-reference.dtb
* Keep r7s72100-genmai.dtb

CONFIG_ARCH_SHMOBILE_MULTI hunk:
* Remove r7s72100-genmai-reference.dtb
* Keep r7s72100-genmai.dtb
* Keep r8a7791-henninger.dtb
arch/arm/boot/dts/Makefile diff1 | diff2 | blob | history
arch/arm/mach-shmobile/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-shmobile/Makefile diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules