Merge branch 'topic/ctl-pid-lock' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 6 Nov 2009 13:58:38 +0000 (14:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 6 Nov 2009 13:58:38 +0000 (14:58 +0100)

Trivial merge