Commit 70da1dc0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents 0d86733c b9cbfcbe

MAINTAINERS

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