diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-12 18:26:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-12 18:26:38 +0200 |
| commit | c012cdc858db36ff2314469930bfcfb00eef6f29 (patch) | |
| tree | 6038ccd1dec55f82642f6036a75af57cb6b2a921 /sound/soc/omap/n810.c | |
| parent | 15439bde3af7ff88459ea2b5520b77312e958df2 (diff) | |
| parent | f6b864a9071e21186476910613ec9913b56067a2 (diff) | |
| download | kernel_goldelico_gta04-c012cdc858db36ff2314469930bfcfb00eef6f29.zip kernel_goldelico_gta04-c012cdc858db36ff2314469930bfcfb00eef6f29.tar.gz kernel_goldelico_gta04-c012cdc858db36ff2314469930bfcfb00eef6f29.tar.bz2 | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/omap/n810.c')
| -rw-r--r-- | sound/soc/omap/n810.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 83d213b..62e292f 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula@gmail.com> + * Contact: 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 @@ -402,6 +402,6 @@ static void __exit n810_soc_exit(void) module_init(n810_soc_init); module_exit(n810_soc_exit); -MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); MODULE_DESCRIPTION("ALSA SoC Nokia N810"); MODULE_LICENSE("GPL"); |