From: Takashi Iwai Date: Thu, 10 Sep 2009 13:32:58 +0000 (+0200) Subject: Merge branch 'topic/oss' into for-linus X-Git-Tag: v2.6.32-rc1~732^2~8 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=fa285190025d0b9a35ed0f6233bfaa721281e0f4 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 --- fa285190025d0b9a35ed0f6233bfaa721281e0f4