diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:22:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:22:36 -0400 |
| commit | 6f130478e24d810078c3f0ee292bcc4ec034dcce (patch) | |
| tree | 1c782ccceaf998e9e23862094588c125ee6f38af /MAINTAINERS | |
| parent | 6f128fa344833bf8bf076a51d14401661c146470 (diff) | |
| parent | 75f2ba8f0006440e720e47ae14c917e07c452d72 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (55 commits)
regulator: Voltage count for AB3100
mfd: Convert WM8350 to use request_threaded_irq()
mfd: Update MAINTAINERS patterns for WM831x
mfd: Fix twl4030-power warnings
regulator: AB3100 support
rtc: AB3100 RTC support
mfd: Fix ab3100-otp build failure
mfd: OMAP: Board-specifc twl4030 DPS scripts for RX51 board
mfd: Print warning for twl4030 out-of-order script loading
mfd: Add support for TWL4030/5030 dynamic power switching
mfd: AB3100 OTP readout
regulator: Add Freescale MC13783 driver
mfd: Add Freescale MC13783 driver
mfd: AB3100 disable irq nosync
mfd: AB3100 alter default setting
mfd: AB3100 propagate error
mfd: AB3100 accessor function cleanups
rtc: Add support for RTCs on Wolfson WM831x devices
regulator: get pcap data from the parent device
input: PCAP2 misc input driver
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e2b9486fd1a9..bd3f026dbe61 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5683,6 +5683,26 @@ S: Supported | |||
| 5683 | F: drivers/input/touchscreen/*wm97* | 5683 | F: drivers/input/touchscreen/*wm97* |
| 5684 | F: include/linux/wm97xx.h | 5684 | F: include/linux/wm97xx.h |
| 5685 | 5685 | ||
| 5686 | WOLFSON MICROELECTRONICS PMIC DRIVERS | ||
| 5687 | P: Mark Brown | ||
| 5688 | M: broonie@opensource.wolfsonmicro.com | ||
| 5689 | L: linux-kernel@vger.kernel.org | ||
| 5690 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus | ||
| 5691 | W: http://opensource.wolfsonmicro.com/node/8 | ||
| 5692 | S: Supported | ||
| 5693 | F: drivers/leds/leds-wm83*.c | ||
| 5694 | F: drivers/mfd/wm8*.c | ||
| 5695 | F: drivers/power/wm83*.c | ||
| 5696 | F: drivers/rtc/rtc-wm83*.c | ||
| 5697 | F: drivers/regulator/wm8*.c | ||
| 5698 | F: drivers/video/backlight/wm83*_bl.c | ||
| 5699 | F: drivers/watchdog/wm83*_wdt.c | ||
| 5700 | F: include/linux/mfd/wm831x/ | ||
| 5701 | F: include/linux/mfd/wm8350/ | ||
| 5702 | F: include/linux/mfd/wm8400/ | ||
| 5703 | F: sound/soc/codecs/wm8350.c | ||
| 5704 | F: sound/soc/codecs/wm8400.c | ||
| 5705 | |||
| 5686 | X.25 NETWORK LAYER | 5706 | X.25 NETWORK LAYER |
| 5687 | M: Henner Eisen <eis@baty.hanse.de> | 5707 | M: Henner Eisen <eis@baty.hanse.de> |
| 5688 | L: linux-x25@vger.kernel.org | 5708 | L: linux-x25@vger.kernel.org |