diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-24 18:54:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-24 18:54:23 -0400 |
| commit | fa7f78e02e69e814e03aebc048971d05cae33d88 (patch) | |
| tree | ceff0863daa0470b6cbccc0e4e91eea4833e9949 /MAINTAINERS | |
| parent | 5e30ca1e44029dad8304976128e3af76e4575cd1 (diff) | |
| parent | 8117bd531501ec329e4c9ea96fb7f9d5504c82f5 (diff) | |
Merge tag 'gpio-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull gpio fixes from Linus Walleij:
- a largeish fix for the IRQ handling in the new Zynq driver. The
quite verbose commit message gives the exact details.
- move some defines for gpiod flags outside an ifdef to make stub
functions work again.
- various minor fixes that we can accept for -rc1.
* tag 'gpio-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio-lynxpoint: enable input sensing in resume
gpio: move GPIOD flags outside #ifdef
gpio: delete unneeded test before of_node_put
gpio: zynq: Fix IRQ handlers
gpiolib: devres: use correct structure type name in sizeof
MAINTAINERS: Change maintainer for gpio-bcm-kona.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c1c08a2652f7..aacfc6a9052b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2065,7 +2065,7 @@ S: Supported | |||
| 2065 | F: drivers/scsi/bnx2i/ | 2065 | F: drivers/scsi/bnx2i/ |
| 2066 | 2066 | ||
| 2067 | BROADCOM KONA GPIO DRIVER | 2067 | BROADCOM KONA GPIO DRIVER |
| 2068 | M: Markus Mayer <markus.mayer@linaro.org> | 2068 | M: Ray Jui <rjui@broadcom.com> |
| 2069 | L: bcm-kernel-feedback-list@broadcom.com | 2069 | L: bcm-kernel-feedback-list@broadcom.com |
| 2070 | S: Supported | 2070 | S: Supported |
| 2071 | F: drivers/gpio/gpio-bcm-kona.c | 2071 | F: drivers/gpio/gpio-bcm-kona.c |