]> git.baikalelectronics.ru Git - kernel.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)
commit02d385796c4579732faa0612ec4f0c1df31a0eb5
tree9f86456e42fd13c3b82f630e6319faa3e6146732
parentb156cb8e28921612335ecf757a7f2200e11840a7
parenta594293a35aa9e6b49bc26f34be0bb25af426831
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