| commit | 0d517fb1f3b297fa202c69c94af11ac60b12028e | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 22 Jul 2009 16:32:12 +0000 (22 09:32 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 22 Jul 2009 16:32:12 +0000 (22 09:32 -0700) | ||
| tree | 703b6df120fa6d1c3fb2886e421ac829dd55f932 | treesnapshot (tar.gz zip) |
| parent | 1fd1f285369d992950a5411139a23f0f5804727a | commitdiff |
| parent | 44f167d376aa42d59d40406036e901a5cf03567f | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
ALSA: ca0106 - Fix the max capture buffer size
ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
ALSA: hda - Add quirk for Gateway T6834c laptop
ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
ALSA: hda_codec: Check for invalid zero connections
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
ALSA: ca0106 - Fix the max capture buffer size
ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
ALSA: hda - Add quirk for Gateway T6834c laptop
ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
ALSA: hda_codec: Check for invalid zero connections