projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c60ecec
d8cf538
)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 05:26:08 +0000
(21:26 -0800)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 05:26:08 +0000
(21:26 -0800)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: relocate sdev->manage_start_stop configuration
sata_sil24: freeze on non-dev errors reported via CERR
sata_sil24: fix stupid typo
ata_piix: ignore ATA_DMA_ERR on vmware ich4
Trivial merge