diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-13 18:36:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-13 18:36:28 -0700 |
| commit | 17987783e51555da22890feb715a0c84d4ed36aa (patch) | |
| tree | 420f72bf4cba816aaf4fd9cae7b99fa2a05131a1 /include | |
| parent | 4c74916fa81ce5a431350cb27eb9a7c95d3cf3d7 (diff) | |
| parent | c012cdc858db36ff2314469930bfcfb00eef6f29 (diff) | |
| download | linux-stable-17987783e51555da22890feb715a0c84d4ed36aa.tar.gz linux-stable-17987783e51555da22890feb715a0c84d4ed36aa.tar.bz2 linux-stable-17987783e51555da22890feb715a0c84d4ed36aa.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Fix compile warning in wm8750.c
ASoC: omap: Update e-mail address of Jarkko Nikula
ASoC: SAMSUNG: Add I2S0 internal dma driver
ASoC: Terminate WM8750 SPI device ID table
ASoC: Add missing break in WM8994 probe
ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc
ALSA: azt3328 - adjust error handling code to include debugging code
ALSA: hda - Add CONFIG_SND_HDA_POWER_SAVE to stac_vrefout_set()
ALSA: usb-audio - Add quirk for BOSS Micro BR-80
ASoC: Fix typo in wm8750 spi_ids
ASoC: Fix warning in Speyside WM8962
ASoC: Fix SPI driver binding for WM8987
ASoC: Fix binding of WM8750 on Jive
ASoC: WM8903: Free IRQ on device removal
ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module
ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS
Diffstat (limited to 'include')
| -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 |