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

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_conexant.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

d39801105722c9aef9eae180656190c399c576a9
Reading git-diff-tree failed