Merged upstream: http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commitdiff;h=7e6c3989af5baee999ef9a4424e85938cba8d34a
Merged upstream: http:// git.kernel. org/?p= linux/kernel/ git/tiwai/ sound-2. 6.git;a= commitdiff; h=7e6c3989af5ba ee999ef9a4424e8 5938cba8d34a