Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Wed, 16 Mar 2011 11:14:46 +0000 (12:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 16 Mar 2011 11:14:46 +0000 (12:14 +0100)

Trivial merge