diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 22:46:24 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 22:46:24 +0200 |
commit | 0b7f509d4585210ef062051e8949b1efe3256f14 (patch) | |
tree | db4ec75f1f48340e8140e60e4dd961658b7853ad /arch/arm/mach-shmobile/board-armadillo800eva-reference.c | |
parent | Merge tag 'renesas-clk-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc (diff) | |
parent | ARM: integrator: add MMCI device to IM-PD1 (diff) | |
download | linux-dev-0b7f509d4585210ef062051e8949b1efe3256f14.tar.xz linux-dev-0b7f509d4585210ef062051e8949b1efe3256f14.zip |
Merge tag 'integrator-for-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
Merge "single Integrator patch" from Linus Walleij:
This sets up the dynamically detected IM-PD1 GPIO lines
by way of GPIO descriptors, avoiding any use of the GPIO
global numberspace.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'integrator-for-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: integrator: add MMCI device to IM-PD1
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva-reference.c')
0 files changed, 0 insertions, 0 deletions