From: Arnd Bergmann Date: Mon, 8 Apr 2013 18:08:43 +0000 (+0200) Subject: Merge tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~67^2~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f29151588744ea2e283971cb0ad403ee04e3e2;p=pandora-kernel.git Merge tag 'bcm2835-for-3.10-multiplatform' of git://git./linux/kernel/git/swarren/linux-rpi into next/multiplatform From Stephen Warren : ARM: bcm2835: convert to multi-platform This branch (patch) converts BCM2835 to support being built into a multi-platform single zImage. This mostly entails a few small Kconfig tweaks, move the earlyprintk implementation to the standard multi- platform location, and deleting some unnecessary files. * tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: convert to multi-platform Conflicts: arch/arm/Kconfig arch/arm/Kconfig.debug Signed-off-by: Arnd Bergmann --- f5f29151588744ea2e283971cb0ad403ee04e3e2 Reading git-diff-tree failed