tree 631e686fb11709add69f07b4fd1e5aaa10f232de
parent 9e18e1869f5ebac69f0d881fe97a198ebc0834db
parent 5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d
author Takashi Iwai <tiwai@suse.de> 1290512705 +0100
committer Takashi Iwai <tiwai@suse.de> 1290512705 +0100

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