projects
/
linux-drm-fsl-dcu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4da3dcf
ab3b3fd
)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
Linus Torvalds
<torvalds@g5.osdl.org>
Sat, 29 Jul 2006 05:47:44 +0000
(22:47 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sat, 29 Jul 2006 05:47:44 +0000
(22:47 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] sata_promise: comment out duplicate PCI ID
[PATCH] libata: improve EH action and EHI flag handling
[PATCH] libata: fix eh_skip_recovery condition
[PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling
Trivial merge
projects / linux-drm-fsl-dcu.git / commitdiff