Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Wed, 21 Jul 2010 13:01:07 +0000 (15:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 21 Jul 2010 13:01:07 +0000 (15:01 +0200)

Trivial merge