Merge branch 'topic/oss' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:58 +0000 (15:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:58 +0000 (15:32 +0200)
* topic/oss:
  ALSA: allocation may fail in snd_pcm_oss_change_params()
  sound: vwsnd: Fix setting of cfgval and ctlval in li_setup_dma()
  sound: fix OSS MIDI output data loss

1  2 
sound/core/oss/pcm_oss.c

Simple merge