瀏覽代碼

Merge branch 'for-2.6.36' into for-2.6.37

Mark Brown 14 年之前
父節點
當前提交
9d9641ec89
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      MAINTAINERS

+ 3 - 1
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