tree ca56b1edbba82dd2ff2e02bc21af279893955c4d
parent ef173de1239afa32e7209c375a703da8c6cc7a7c
parent 805504abdc73cfc745a5fee3d616cdb24bb2a68c
author Olof Johansson <olof@lixom.net> 1353487710 -0800
committer Olof Johansson <olof@lixom.net> 1353492789 -0800

Merge tag 'bcm2835-for-3.8-soc' of git://git.kernel.org/pub/scm/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>