Merge branch 'topic/ctl-pid-lock' into topic/core-change
Takashi Iwai [Tue, 10 Nov 2009 15:30:03 +0000 (16:30 +0100)]
1  2 
sound/core/rawmidi.c

Simple merge