]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 20d2157 b9559c4)
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)
commit0cbd2ba0f009f667bee9660ba0c2e1e4b8bfaaff
treeea7b918873ff5c47e6213a7958c9623605382244tree | snapshot
parent20d215770f2acbbd0a57ed52c76aca9a91badca1commit | diff
parentb9559c42dae30c50fbd34aae0cb11d29ab7fd726commit | 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
Linux Kernel Source Tree.