Merge branch 'fix/asoc' into for-linus (dd4025bd) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5008,6 +5008,12 @@ F: drivers/media/common/saa7146*
	F: drivers/media/video/7146		F: drivers/media/video/7146
	F: include/media/7146		F: include/media/7146

			SAMSUNG AUDIO (ASoC) DRIVERS
			M: Jassi Brar <jassi.brar@samsung.com>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			S: Supported
			F: sound/soc/s3c24xx

	TLG2300 VIDEO4LINUX-2 DRIVER		TLG2300 VIDEO4LINUX-2 DRIVER
	M: Huang Shijie <shijie8@gmail.com>		M: Huang Shijie <shijie8@gmail.com>
	M: Kang Yong <kangyong@telegent.com>		M: Kang Yong <kangyong@telegent.com>
	@@ -6450,8 +6456,10 @@ F: include/linux/wm97xx.h
	WOLFSON MICROELECTRONICS DRIVERS		WOLFSON MICROELECTRONICS DRIVERS
	M: Mark Brown <broonie@opensource.wolfsonmicro.com>		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
	M: Ian Lartey <ian@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		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		S: Supported
	F: Documentation/hwmon/wm83??		F: Documentation/hwmon/wm83??
	F: drivers/leds/leds-wm83*.c		F: drivers/leds/leds-wm83*.c