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 /tools/perf/scripts/python/futex-contention.py | |
| parent | 640b321aba4b880dfa517a047ef6ccee0a437c3d (diff) | |
| parent | 684284b64aae96c8d5de0dc0d6e4b72f8b3502ce (diff) | |
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 'tools/perf/scripts/python/futex-contention.py')
0 files changed, 0 insertions, 0 deletions