Merge branch 'for-2.6.39' into for-2.6.40

git-mirror · Apr 9, 2011 · 70da1dc · 70da1dc
2 parents 0d86733 + b9cbfcb
commit 70da1dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -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