diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-03 12:20:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-03 12:20:41 -0500 |
| commit | 9cd6315357eccb768d9062cb43e3dc741e922020 (patch) | |
| tree | 0381d3684848f9529c7dcf8477c0d1cf30d5e1f3 /arch/x86 | |
| parent | 88063dd69b124721e18a59535d4f35266fcb867f (diff) | |
| parent | 2ff38c9fbaa86264ad819117ab137361067ab5f1 (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:
ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
ALSA: hda: Use "alienware" model quirk for another SSID
ASoC: WM8731: Fix incorrect mask for bypass path disable
s6105-ipcam: fix compilation
s6000-pcm: fix compilation
s6000-i2s: fix compilation
ASoC: Fix missing spin_unlock_irqrestore
ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
ASoC: Add missing dev_set_drvdata in p1022_ds_probe
ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe
ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready
ASoC: Fix compile error for nuc900-pcm.c
ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove
ASoC: Fix compile error for nuc900-ac97.c
ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions