tree c999d56c418920a9fda656259afb3f13dfd7616e
parent 83b0c6ba999643ee8ad6329f26e1cdc870e1a920
parent c817eebec5971febab86d397582954bd52f403a8
author Takashi Iwai <tiwai@suse.de> 1334848679 +0200
committer Takashi Iwai <tiwai@suse.de> 1334848813 +0200

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_conexant.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>