diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-20 11:25:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-20 11:25:32 +0200 |
| commit | 4a787a3ff3f419c23ab0a5cef677fa441356b818 (patch) | |
| tree | bc806899cc9038a6fa6abb16731eb2e4371a3b44 /sound/soc/omap/omap-mcbsp.h | |
| parent | a0c8326397262f1817ee6c5212ad6adf43e3df36 (diff) | |
| parent | d491297752c3a36f6cfabd4cd578c0cfa2098044 (diff) | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.h')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index 37dc7211ed3..9a7dedd6f5a 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h @@ -4,7 +4,7 @@ * Copyright (C) 2008 Nokia Corporation * * Contact: Jarkko Nikula <jhnikula@gmail.com> - * Peter Ujfalusi <peter.ujfalusi@nokia.com> + * Peter Ujfalusi <peter.ujfalusi@ti.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |