Merge branch 'for-2.6.39' into for-2.6.40

70da1dc0 · Mark Brown · 0d86733c · b9cbfcbe · 70da1dc0
Commit 70da1dc0 authored Apr 09, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

MAINTAINERS MAINTAINERS +1 -1

No files found.
--- 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