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)
1  2 
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c

Simple merge