diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 11:48:29 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 11:48:29 +0900 |
| commit | 42bef6866f0625108f695cae4719af6c34b99468 (patch) | |
| tree | 08021f818e728158c7b4c9ef433a68e09add607d /include/sound | |
| parent | 4c54c6de1aaad76092a1bc3194b351956d071b84 (diff) | |
| parent | 7ec41ee5ad5f716f67041c0d49014d0becb5332c (diff) | |
| download | linux-42bef6866f0625108f695cae4719af6c34b99468.tar.gz linux-42bef6866f0625108f695cae4719af6c34b99468.tar.bz2 linux-42bef6866f0625108f695cae4719af6c34b99468.zip | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/tlv320aic3x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h index 99e0308bf2c2..ffd9bc793105 100644 --- a/include/sound/tlv320aic3x.h +++ b/include/sound/tlv320aic3x.h @@ -1,7 +1,7 @@ /* * Platform data for Texas Instruments TLV320AIC3x codec * - * Author: Jarkko Nikula <jhnikula@gmail.com> + * Author: 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 version 2 as |