Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
Takashi Iwai [Tue, 27 Apr 2010 13:35:59 +0000 (15:35 +0200)]

Trivial merge