diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-17 14:47:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-17 14:47:40 -0500 |
commit | 0eda4020ae53cc057a04ccc802a67f2a5336f8ef (patch) | |
tree | 163423e87c30c4857de0401b1e155f26406e2405 /MAINTAINERS | |
parent | a5905a9205164023191e47f62ef9b3929ddcc48e (diff) | |
parent | 8808b64daac68a2c85366c767a3ef850824ede74 (diff) |
Merge tag 'gpio-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
"All but one are long-standing bug fixes that are also tagged for
stable
- Driver bug fixes for SH PFC, TWL4030, MSM and RCAR.
- Update the MAINTAINERS"
* tag 'gpio-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio: rcar: Fix level interrupt handling
gpio: msm: Fix irq mask/unmask by writing bits instead of numbers
gpio: twl4030: Fix regression for twl gpio LED output
sh-pfc: Fix PINMUX_GPIO macro
MAINTAINERS: update GPIO maintainers entry
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1344816c4c06..75e3db96dec5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3761,9 +3761,11 @@ F: include/uapi/linux/gigaset_dev.h | |||
3761 | 3761 | ||
3762 | GPIO SUBSYSTEM | 3762 | GPIO SUBSYSTEM |
3763 | M: Linus Walleij <linus.walleij@linaro.org> | 3763 | M: Linus Walleij <linus.walleij@linaro.org> |
3764 | S: Maintained | 3764 | M: Alexandre Courbot <gnurou@gmail.com> |
3765 | L: linux-gpio@vger.kernel.org | 3765 | L: linux-gpio@vger.kernel.org |
3766 | F: Documentation/gpio.txt | 3766 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git |
3767 | S: Maintained | ||
3768 | F: Documentation/gpio/ | ||
3767 | F: drivers/gpio/ | 3769 | F: drivers/gpio/ |
3768 | F: include/linux/gpio* | 3770 | F: include/linux/gpio* |
3769 | F: include/asm-generic/gpio.h | 3771 | F: include/asm-generic/gpio.h |