Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
Mark Brown [Tue, 1 Feb 2011 14:55:10 +0000 (14:55 +0000)]

Trivial merge