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)
commit63862f14bdf9e1251b7398947265422ec9b1400b
treefdf5ccd215cfa23792964fbff600116788349d20
parentb77c6bcef2082a7cd96124daf15df8da5b670ebe
parent2349199db55bfb99e2ebdce285a7e297ba63a7ef
Merge branch 'heads/soc2' into boards2-base
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-lager.c