diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-07 16:44:20 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-07 16:44:20 -0400 |
| commit | 9d9641ec891a53ef93a8972c7913605aeb8127c7 (patch) | |
| tree | 2eb1dbe5f62a174912f51f5bfaec5e1e849a2457 | |
| parent | 5c75848a7ca19c83c7b8afd0822bdcb716992c0c (diff) | |
| parent | cf8eda3ef0039911557a3c11f1f18f9ce2d3c323 (diff) | |
Merge branch 'for-2.6.36' into for-2.6.37
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f51409b1527..31306ceb567 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6411,8 +6411,10 @@ F: include/linux/wm97xx.h | |||
| 6411 | WOLFSON MICROELECTRONICS DRIVERS | 6411 | WOLFSON MICROELECTRONICS DRIVERS |
| 6412 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 6412 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| 6413 | M: Ian Lartey <ian@opensource.wolfsonmicro.com> | 6413 | M: Ian Lartey <ian@opensource.wolfsonmicro.com> |
| 6414 | M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | ||
| 6415 | T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc | ||
| 6414 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus | 6416 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus |
| 6415 | W: http://opensource.wolfsonmicro.com/node/8 | 6417 | W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices |
| 6416 | S: Supported | 6418 | S: Supported |
| 6417 | F: Documentation/hwmon/wm83?? | 6419 | F: Documentation/hwmon/wm83?? |
| 6418 | F: drivers/leds/leds-wm83*.c | 6420 | F: drivers/leds/leds-wm83*.c |