summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/rx51.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-12 18:26:38 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-12 18:26:38 +0200
commitc012cdc858db36ff2314469930bfcfb00eef6f29 (patch)
tree6038ccd1dec55f82642f6036a75af57cb6b2a921 /sound/soc/omap/rx51.c
parent15439bde3af7ff88459ea2b5520b77312e958df2 (diff)
parentf6b864a9071e21186476910613ec9913b56067a2 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/omap/rx51.c')
-rw-r--r--sound/soc/omap/rx51.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 0aae998b654..893300a53ba 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -5,7 +5,7 @@
*
* Contact: Peter Ujfalusi <peter.ujfalusi@ti.com>
* Eduardo Valentin <eduardo.valentin@nokia.com>
- * Jarkko Nikula <jhnikula@gmail.com>
+ * Jarkko Nikula <jarkko.nikula@bitmer.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License