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-Tag: MMI-PSA29.97-13-9~18103^2~124^2~69^2~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=216c7a0f22a088ff9f7c14f82c5bf93294875df9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

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

216c7a0f22a088ff9f7c14f82c5bf93294875df9