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)
commitfa285190025d0b9a35ed0f6233bfaa721281e0f4
treeb82ba1f315aa10440af14c4adc64a24aa0e18325
parent9cd9f4276766e15be40d09f77e28656797a1b06f
parentcbbb05703da4b205bb17fde555d3b2926d8b3194
Merge branch 'topic/oss' into for-linus

* 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
sound/core/oss/pcm_oss.c