From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 7 Apr 2012 10:26:55 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.5-rc1~83^2~4^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ff5c3a4ab0d638fa63e939e75727c233b681e8d;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

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

5ff5c3a4ab0d638fa63e939e75727c233b681e8d
Reading git-diff-tree failed