Commit 35e60448 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.36' into for-2.6.37

parents fc38a8a1 4a109cc0
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -4965,6 +4965,12 @@ F: drivers/media/common/saa7146*
F:	drivers/media/video/*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
M:	Huang Shijie <shijie8@gmail.com>
M:	Kang Yong <kangyong@telegent.com>