tree abdee28e90a5a911d0762286d729ea7f7d3cb65b
parent 127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f
parent c39555d6edd0142972f577405d5259879ecc1635
author Takashi Iwai <tiwai@suse.de> 1226772321 +0100
committer Takashi Iwai <tiwai@suse.de> 1226772321 +0100

Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_sigmatel.c