]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'heads/boards2' into next
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:44:50 +0000 (10:44 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:44:50 +0000 (10:44 +0900)
1  2 
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-bockw.c

Simple merge