Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Wed, 11 Jan 2012 14:30:53 +0000 (15:30 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Jan 2012 14:30:53 +0000 (15:30 +0100)

Trivial merge