Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
Takashi Iwai [Fri, 20 May 2011 09:25:32 +0000 (11:25 +0200)]

Trivial merge