Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d9641ec authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.36' into for-2.6.37

parents 5c75848a cf8eda3e

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -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