Merge tag 'integrator-for-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:46:24 +0000 (22:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:46:24 +0000 (22:46 +0200)
commit0b7f509d4585210ef062051e8949b1efe3256f14
treedb4ec75f1f48340e8140e60e4dd961658b7853ad
parent640b321aba4b880dfa517a047ef6ccee0a437c3d
parent684284b64aae96c8d5de0dc0d6e4b72f8b3502ce
Merge tag 'integrator-for-v3.18-1' of git://git./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