Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Thu, 24 Jun 2010 09:11:41 +0000 (11:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Jun 2010 09:11:41 +0000 (11:11 +0200)

Trivial merge