Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 14 Sep 2011 23:02:28 +0000 (00:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 14 Sep 2011 23:02:28 +0000 (00:02 +0100)
commit1db3706b05b11abcf2673ffbed5ad43b4c90ed11
tree09fa867d9d9db6ed475eaa889da143603441e1a6
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893
parent63d15148b6058ab0037343390e8918503ed81968
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c