diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:11:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:11:05 -0800 |
| commit | a8aa1ebdf880ebe7b5738ccebf67e18d62cbdc0b (patch) | |
| tree | c58fe906727ee290c9e0f77a2f659fb61c378db0 /drivers/s390/cio/css.c | |
| parent | 8f0ddf91f2aeb09602373e400cf8b403e9017210 (diff) | |
| parent | a9e060571a057c132240753b7f815f4a1e0320a3 (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: ac97_codec - increase timeout for analog sections to 5 second
ASoC: Correct code taking the size of a pointer
ALSA: hda - Add PCI IDs for Nvidia G2xx-series
ALSA: sound/isa/gus: Correct code taking the size of a pointer
ALSA: hda: Fix max PCM level to 0 dB for AD1981_HP
ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)
Diffstat (limited to 'drivers/s390/cio/css.c')
0 files changed, 0 insertions, 0 deletions