Merge branch 'for-2.6.39' into for-2.6.40

This commit is contained in:
Mark Brown 2011-04-09 11:33:45 +09:00
commit 70da1dc052

View file

@ -5390,7 +5390,7 @@ F: drivers/media/video/*7146*
F: include/media/*7146*
SAMSUNG AUDIO (ASoC) DRIVERS
M: Jassi Brar <jassi.brar@samsung.com>
M: Jassi Brar <jassisinghbrar@gmail.com>
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S: Supported
F: sound/soc/samsung