projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b77c6bc 2349199)
Merge branch 'heads/soc2' into boards2-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 00:31:20 +0000 (09:31 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 00:31:20 +0000 (09:31 +0900)
1  2 
arch/arm/mach-shmobile/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-ape6evm.c patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-lager.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge
diff --cc arch/arm/mach-shmobile/Makefile
Simple merge
diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.