From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 21 Jun 2011 05:34:00 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/via-cleanup
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=216c7a0f22a088ff9f7c14f82c5bf93294875df9;p=deliverable%2Flinux.git

Merge branch 'fix/hda' into topic/via-cleanup

Conflicts:
	sound/pci/hda/patch_via.c
---

216c7a0f22a088ff9f7c14f82c5bf93294875df9