Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Tue, 5 Jul 2011 05:33:06 +0000 (07:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 5 Jul 2011 05:33:06 +0000 (07:33 +0200)

Trivial merge