Merge tag 'bcm2835-for-3.10-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 18:14:49 +0000 (20:14 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 18:14:49 +0000 (20:14 +0200)
From Stephen Warren <swarren@wwwdotorg.org>:

ARM: bcm2835: defconfig updates

This branch (patch) updates bcm2835_defconfig to enable new features that
were added this kernel cycle. Namely, the SPI controller and HW random
number generator.

* tag 'bcm2835-for-3.10-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: defconfig updates

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge