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 /include | |
| 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 'include')
| -rw-r--r-- | include/sound/tlv320dac33-plat.h | 2 | ||||
| -rw-r--r-- | include/sound/tpa6130a2-plat.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/tlv320dac33-plat.h b/include/sound/tlv320dac33-plat.h index 6c664965679..0b94192a8cd 100644 --- a/include/sound/tlv320dac33-plat.h +++ b/include/sound/tlv320dac33-plat.h @@ -1,7 +1,7 @@ /* * Platform header for Texas Instruments TLV320DAC33 codec driver * - * Author: Peter Ujfalusi <peter.ujfalusi@nokia.com> + * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> * * Copyright: (C) 2009 Nokia Corporation * diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h index e29fde6b5cb..89beccb57ed 100644 --- a/include/sound/tpa6130a2-plat.h +++ b/include/sound/tpa6130a2-plat.h @@ -3,7 +3,7 @@ * * Copyright (C) Nokia Corporation * - * Written by Peter Ujfalusi <peter.ujfalusi@nokia.com> + * Author: 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 |