diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:48:30 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 02:13:09 -0800 |
commit | ea091f6dbd2e5df03b6bbb11467c553ebedd16a2 (patch) | |
tree | ca56b1edbba82dd2ff2e02bc21af279893955c4d /arch/arm/include/asm | |
parent | ef173de1239afa32e7209c375a703da8c6cc7a7c (diff) | |
parent | 805504abdc73cfc745a5fee3d616cdb24bb2a68c (diff) | |
download | blackbird-op-linux-ea091f6dbd2e5df03b6bbb11467c553ebedd16a2.tar.gz blackbird-op-linux-ea091f6dbd2e5df03b6bbb11467c553ebedd16a2.zip |
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>
Diffstat (limited to 'arch/arm/include/asm')
0 files changed, 0 insertions, 0 deletions