Merge branch 'soc' into boards
authorSimon Horman <horms@verge.net.au>
Thu, 8 Nov 2012 08:49:35 +0000 (17:49 +0900)
committerSimon Horman <horms@verge.net.au>
Thu, 8 Nov 2012 08:49:35 +0000 (17:49 +0900)
Conflicts:
arch/arm/configs/marzen_defconfig


Trivial merge