Merge branch 'dt2' into cleanup3-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 6 Aug 2013 09:06:53 +0000 (18:06 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 6 Aug 2013 09:06:53 +0000 (18:06 +0900)
Conflicts:
arch/arm/mach-shmobile/Makefile.boot


Trivial merge