Merge branch 'for-2.6.36' into for-2.6.37

git-mirror · Oct 7, 2010 · 9d9641e · 9d9641e
2 parents 5c75848 + cf8eda3
commit 9d9641e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -6411,8 +6411,10 @@ F:	include/linux/wm97xx.h
 WOLFSON MICROELECTRONICS DRIVERS
 M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
 M:	Ian Lartey <ian@opensource.wolfsonmicro.com>
+M:	Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
+T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
-W:	http://opensource.wolfsonmicro.com/node/8
+W:	http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 S:	Supported
 F:	Documentation/hwmon/wm83??
 F:	drivers/leds/leds-wm83*.c