diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-22 19:04:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-22 19:04:21 -0700 |
| commit | b7371e31257677a71e19c885ff6796480464f60d (patch) | |
| tree | 5cacbf6b762ab11b3d42261fb073631582e3b52e /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block (diff) | |
| parent | drivers: gpio: msm: Fix the error condition for reading ngpio (diff) | |
| download | wireguard-linux-b7371e31257677a71e19c885ff6796480464f60d.tar.xz wireguard-linux-b7371e31257677a71e19c885ff6796480464f60d.zip | |
Merge tag 'gpio-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull gpio fixes from Linus Walleij:
"A first round of GPIO fixes for the v3.11 series:
- OMAP device tree boot fix
- Handle an error condition in the MSM driver
The OMAP patches have been around since around the merge window, but
since they first caused more breakage I let them boil in -next for a
while. These should be fine now"
* tag 'gpio-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
drivers: gpio: msm: Fix the error condition for reading ngpio
gpio/omap: fix build error when OF_GPIO is not defined.
gpio/omap: auto request GPIO as input if used as IRQ via DT
gpio/omap: don't create an IRQ mapping for every GPIO on DT
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions