Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 21 Jul 2009 17:03:22 +0000 (19:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Jul 2009 17:03:22 +0000 (19:03 +0200)
commit01b7029d5e81fa6fef5e4f65c530a5e3ecaebdfa
tree6ba4b322481ee5ddbc81ad23a42d6f2ca902855e
parent8d80dcccf4d3854e985743a234892340700f41d7
parent5f56d5f9248decf25db92209cdc244f02aa89a6a
Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: ca0106 - Fix the max capture buffer size
  ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
  ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
sound/pci/ca0106/ca0106_main.c