diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 09:46:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 09:46:12 -0700 |
| commit | 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d (patch) | |
| tree | 103ac307d60c73ca9158a8ae1d9cc3586867fbc4 /include/linux/slub_def.h | |
| parent | bb1e9b844b989fc9a4dfffbf7a064703cda2a6a6 (diff) | |
| parent | 9ea5ca75a2aebb7172094a7d77acf6ff7600cc56 (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:
sound: OSS: mpu401, fix deadlock
ALSA: hda - Add missing initializations for ALC268 and ALC269
ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
ALSA: hda - Line In for Acer Inspire 6530G model
sound: oxygen: make mic volume control mono
MAINTAINERS: Add entry for twl4030 series soc codec driver
ALSA: lx6464es - configure ethersound io channels
sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
sound: Use PCI_VDEVICE
ALSA: hda - Use model=acer-aspire-6530g for Acer Aspire 6930G
ALSA: hda - Fix acer-aspire-6530g model quirk
ALSA: hda - Add pin-sense trigger when needed for Realtek codecs
ALSA: hda - Fix support for Samsung P50 with AD1986A codec
ALSA: hda - Generalize the pin-detect quirk for Lenovo N100
ALSA: hda - Simplify AD1986A mixer definitions
Diffstat (limited to 'include/linux/slub_def.h')
0 files changed, 0 insertions, 0 deletions