Merged upstream: http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commitdiff;h=01f5966d2f36f08eb6604665eade69c9f38ffaed
Merged upstream: http:// git.kernel. org/?p= linux/kernel/ git/tiwai/ sound-2. 6.git;a= commitdiff; h=01f5966d2f36f 08eb6604665eade 69c9f38ffaed