Merge tag 'bcm2835-for-3.8-soc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 08:48:30 +0000 (00:48 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 10:13:09 +0000 (02:13 -0800)
commitea091f6dbd2e5df03b6bbb11467c553ebedd16a2
treeca56b1edbba82dd2ff2e02bc21af279893955c4d
parentef173de1239afa32e7209c375a703da8c6cc7a7c
parent805504abdc73cfc745a5fee3d616cdb24bb2a68c
Merge tag 'bcm2835-for-3.8-soc' of git://git./linux/kernel/git/swarren/linux-rpi into next/soc

From Stephen Warren:
ARM: bcm2835: core SoC enhancements

A machine restart/reboot implementation is added. The GPIO/pinmux
controller is instantiated, and dummy gpio.h added.

* tag 'bcm2835-for-3.8-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: enable GPIO/pinctrl
  ARM: bcm2835: implement machine restart hook

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig