From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 20 Dec 2011 14:42:57 +0000 (+0100)
Subject: Merge branch 'test/hda-jack' into topic/hda
X-Git-Tag: v3.3-rc1~88^2^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78c058df6a120044455b5635daefdc515bf9d899;p=pandora-kernel.git

Merge branch 'test/hda-jack' into topic/hda

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

78c058df6a120044455b5635daefdc515bf9d899
Reading git-diff-tree failed