tree 5c7431ab4d7f31d99756459494f3ab4dc8752078
parent bedfcebb4fb33fc9ebd395462e72afa103db0bec
parent bb543c969467f33c3a1a0ccfcfcd9a508cd81c54
author Takashi Iwai <tiwai@suse.de> 1235753251 +0100
committer Takashi Iwai <tiwai@suse.de> 1235753251 +0100

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c