diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 11:48:29 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 11:48:29 +0900 |
| commit | 42bef6866f0625108f695cae4719af6c34b99468 (patch) | |
| tree | 08021f818e728158c7b4c9ef433a68e09add607d /sound/soc/omap/omap-pcm.c | |
| parent | 4c54c6de1aaad76092a1bc3194b351956d071b84 (diff) | |
| parent | 7ec41ee5ad5f716f67041c0d49014d0becb5332c (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index b2f5751edae3..9b5c88ac35b9 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula@gmail.com> + * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com> * Peter Ujfalusi <peter.ujfalusi@ti.com> * * This program is free software; you can redistribute it and/or @@ -436,6 +436,6 @@ static void __exit snd_omap_pcm_exit(void) } module_exit(snd_omap_pcm_exit); -MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); MODULE_DESCRIPTION("OMAP PCM DMA module"); MODULE_LICENSE("GPL"); |