diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 09:14:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 09:14:52 -0700 |
| commit | 720e87efe21b43c89093c1f04ec9ecba2f0213b8 (patch) | |
| tree | 2cda871ad084ae5ba110c23075dd3c6e84d041ae /arch/arm/mach-shark | |
| parent | ccd00d1091fa7fff151127f26f6900be2ac8cc10 (diff) | |
| parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
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:
ALSA: pcm: fix infinite loop in snd_pcm_update_hw_ptr0()
ALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220
ALSA: ens1371: fix Creative Ectiva support
ALSA: firewire-speakers: fix hang when unplugging a running device
ASoC: Fix CODEC device name for Corgi
ALSA: hda - Fix pin-config of Gigabyte mobo
ASoC: imx: fix burstsize for DMA
ASoC: imx: set watermarks for mx2-dma
ASoC: twl6040: Return -ENOMEM if create_singlethread_workqueue fails
ASoC: tlv320dac33: Restore L/R DAC power control register
ASoC: Explicitly say registerless widgets have no register
ASoC: tlv320dac33: Fix inconsistent spinlock usage
Diffstat (limited to 'arch/arm/mach-shark')
0 files changed, 0 insertions, 0 deletions