Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
Takashi Iwai [Mon, 2 Aug 2010 10:10:52 +0000 (12:10 +0200)]

Trivial merge