tree b7510300fae4fd06a29b2d773fb841e4ca3c8956
parent b1e4422f96a9b4830ffd8119b05211abb830ef4a
parent 005b10769c05fb16db70f7689ffb5ba17e3fc324
author Takashi Iwai <tiwai@suse.de> 1247158118 +0200
committer Takashi Iwai <tiwai@suse.de> 1247158118 +0200

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

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