Merge tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 18:07:07 +0000 (20:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 18:07:07 +0000 (20:07 +0200)
commite52ec42853697da0a363a20fad2087b8bfd6a43a
treecbc1fc1927e575e80c1e61d6fd7ffb9fc8f78273
parent9c23ad0d4e3ca505549f169b37f7d4e95321d0cc
parenta1bf70828ea0547b4e3d7eaeb63ae3eb2400cb93
Merge tag 'bcm2835-for-3.10-dt' of git://git./linux/kernel/git/swarren/linux-rpi into next/dt

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: bcm2835: device tree updates

This branch adds two devices to the BCM2835 SoC device tree: the SPI
controller and the HW random number generator.

The SPI controller isn't actually instantiated in the Raspberry Pi
device tree, since there are no on-board SPI devices; it's up to the
end-user to modify their own device-tree to describe whatever they
have attached.

* tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: add Broadcom BCM2835 RNG to the device tree
  ARM: bcm2835: add SPI device to DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/bcm2835.dtsi