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

Merge branch 'fix/cxt-stable' into fix/hda

Merge fixes for Thinkpad docking-station regressions for 3.3 kernels
back to 3.4.  These were committed in that branch to make the stable
merging easier.

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

c817eebec5971febab86d397582954bd52f403a8
Reading git-diff-tree failed