diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 08:04:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 08:04:01 -0400 |
commit | c9d6329c35869ebf2ff88a5831e8073d3365e8bd (patch) | |
tree | 735df8ad43f404ca031dd2cf2040d74538958b47 /MAINTAINERS | |
parent | 4e7e2a2008f5d8c49791c412849d5b0232d39bb3 (diff) | |
parent | ad7761ab3adc03fbf2cca8e3c84344175d876c40 (diff) |
Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl
* 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
pinctrl/sirf: fix sirfsoc_get_group_pins prototype
pinctrl: Don't copy function name when requesting a pin
pinctrl: Don't copy pin names when registering them
pinctrl: Remove unsafe __refdata
pinctrl: get_group_pins() const fixes
pinctrl: add a driver for the CSR SiRFprimaII pinmux
pinctrl: add a driver for the U300 pinmux
drivers: create a pin control subsystem
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f1db840686b1..04c0dd8d9921 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5042,6 +5042,11 @@ L: linux-mtd@lists.infradead.org | |||
5042 | S: Maintained | 5042 | S: Maintained |
5043 | F: drivers/mtd/devices/phram.c | 5043 | F: drivers/mtd/devices/phram.c |
5044 | 5044 | ||
5045 | PIN CONTROL SUBSYSTEM | ||
5046 | M: Linus Walleij <linus.walleij@linaro.org> | ||
5047 | S: Maintained | ||
5048 | F: drivers/pinmux/ | ||
5049 | |||
5045 | PKTCDVD DRIVER | 5050 | PKTCDVD DRIVER |
5046 | M: Peter Osterlund <petero2@telia.com> | 5051 | M: Peter Osterlund <petero2@telia.com> |
5047 | S: Maintained | 5052 | S: Maintained |