Merge remote branch 'alsa/devel' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:56:12 +0000 (13:56 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:56:12 +0000 (13:56 +0200)
1  2 
sound/core/oss/mixer_oss.c

Simple merge