summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-09 11:33:45 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-09 11:33:45 +0900
commit70da1dc052349b75a91fea1198258c99cea03390 (patch)
tree20e938d8a10c0c2ad962e211cb558aee5d45a615
parent0d86733cce776ca0262b850ee8eb46bc52dc8244 (diff)
parentb9cbfcbe260c43bac3a6d941b095cc4dcf70e614 (diff)
Merge branch 'for-2.6.39' into for-2.6.40
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b4b9cdec37..c4fb13f59f3 100644
--- 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