git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
590b477
d70f363
)
Merge branch 'fix/cxt-stable' into fix/hda
author
Takashi Iwai
<tiwai@suse.de>
Thu, 19 Apr 2012 15:13:03 +0000
(17:13 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 19 Apr 2012 15:13:03 +0000
(17:13 +0200)
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
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff