diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-20 12:45:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-20 12:45:40 +0100 |
| commit | 9b5b0c01598f9782690b09ce6c49f4ba116dde44 (patch) | |
| tree | dc8f4f66ed75f0b4843619362e088618e160847c /sound/soc/omap/omap-mcbsp.c | |
| parent | 7154b3e80203ee91f9ba7d0a43d3daa05c49d9e9 (diff) | |
| parent | b08f7a62cafd7998862072a1c353219e3d84bbef (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 4d6ef0bf71d..495192af8c2 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -3,7 +3,8 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> + * Contact: Jarkko Nikula <jhnikula@gmail.com> + * Peter Ujfalusi <peter.ujfalusi@nokia.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -546,6 +547,6 @@ static void __exit snd_omap_mcbsp_exit(void) } module_exit(snd_omap_mcbsp_exit); -MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); +MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); MODULE_DESCRIPTION("OMAP I2S SoC Interface"); MODULE_LICENSE("GPL"); |