Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 10:39:28 +0000 (12:39 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 10:39:28 +0000 (12:39 +0200)

Trivial merge