git.karo-electronics.de Git - mv-sheeva.git/commit

]> git.karo-electronics.de Git - mv-sheeva.git/commit

projects / mv-sheeva.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9e18e18 5b3b0fa)

author	Takashi Iwai <tiwai@suse.de>
	Tue, 23 Nov 2010 11:45:05 +0000 (12:45 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 23 Nov 2010 11:45:05 +0000 (12:45 +0100)
commit	2ab46c9390e74368a38ddb5aa525124518df8b69
tree	631e686fb11709add69f07b4fd1e5aaa10f232de	tree \| snapshot
parent	9e18e1869f5ebac69f0d881fe97a198ebc0834db	commit \| diff
parent	5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/tpa6130a2.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/twl4030.c	diff1 \|	diff2 \|	blob \| history

Linux for Marvell Sheeva based platforms