projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 590b477 d70f363)
Merge branch 'fix/cxt-stable' into fix/hda
authorTakashi Iwai <tiwai@suse.de>
Thu, 19 Apr 2012 15:13:03 +0000 (17:13 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 19 Apr 2012 15:13:03 +0000 (17:13 +0200)
commitc817eebec5971febab86d397582954bd52f403a8
treeea7b918873ff5c47e6213a7958c9623605382244tree | snapshot
parent590b4775d6b628c7ad215fd0335a0a787032e2ddcommit | diff
parentd70f363222ef373c2037412f09a600357cfa1c7acommit | diff
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
sound/pci/hda/patch_conexant.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.