]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite14d1a309ca9449332f9a03d977156789759dc25
tree631e686fb11709add69f07b4fd1e5aaa10f232de
parent62f2761117a24e570e2e14b875dfa25cd5a0bea8
parent2da1e469a6395a5f5cfcadc9fbac84bbfd0dc425
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc

Conflicts:
sound/soc/codecs/tpa6130a2.c
sound/soc/codecs/tlv320aic3x.c
sound/soc/codecs/tpa6130a2.c
sound/soc/codecs/twl4030.c