Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 06:20:30 +0000 (07:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 06:20:30 +0000 (07:20 +0100)

Trivial merge