diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-19 17:13:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-19 17:13:03 +0200 |
| commit | c817eebec5971febab86d397582954bd52f403a8 (patch) | |
| tree | ea7b918873ff5c47e6213a7958c9623605382244 /tools/nfsd | |
| parent | 590b4775d6b628c7ad215fd0335a0a787032e2dd (diff) | |
| parent | d70f363222ef373c2037412f09a600357cfa1c7a (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
Diffstat (limited to 'tools/nfsd')
0 files changed, 0 insertions, 0 deletions