diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-30 02:54:18 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-30 02:54:18 (GMT) |
commit | d21685ec258f803d3badae5eae821383a34815a9 (patch) | |
tree | 7ab60a2a5d557a4f345b01a79ca2f877c06d9b92 /sound/soc/codecs/tpa6130a2.h | |
parent | 74ab24af4fe165de5af01d0507250dd099f096b0 (diff) | |
parent | ea02c63d57d7ec099f66ddb2942b4022e865cd5f (diff) | |
download | linux-fsl-qoriq-d21685ec258f803d3badae5eae821383a34815a9.tar.xz |
Merge branch 'for-2.6.40' into for-2.6.41
Diffstat (limited to 'sound/soc/codecs/tpa6130a2.h')
-rw-r--r-- | sound/soc/codecs/tpa6130a2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tpa6130a2.h b/sound/soc/codecs/tpa6130a2.h index 5df49c8..4174440 100644 --- a/sound/soc/codecs/tpa6130a2.h +++ b/sound/soc/codecs/tpa6130a2.h @@ -3,7 +3,7 @@ * * Copyright (C) Nokia Corporation * - * Author: 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 |