]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'heads/soc2' into boards2-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:01:47 +0000 (10:01 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:01:47 +0000 (10:01 +0900)
commit661a7335c4e47726df1e7264580209847509569a
tree9f86456e42fd13c3b82f630e6319faa3e6146732
parent63862f14bdf9e1251b7398947265422ec9b1400b
parent687c27b07050c21a62c4c975777c89e698649a6b
Merge branch 'heads/soc2' into boards2-base

Conflicts:
arch/arm/mach-shmobile/board-lager.c
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-lager.c