Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Tue, 23 Nov 2010 11:45:05 +0000 (12:45 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 23 Nov 2010 11:45:05 +0000 (12:45 +0100)
Conflicts:
sound/soc/codecs/tpa6130a2.c


Trivial merge