OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
365bbe0
e93f09d
)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 19:30:47 +0000
(11:30 -0800)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 19:30:47 +0000
(11:30 -0800)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_mv HighPoint 2310 support (88SX7042)
libata: fix handling of port actions in per-dev action mask
libata: initialize qc->dma_dir to DMA_NONE
sata_via: add PCI ID 0x5337
libata doc: "error : unterminated entity reference exceptions"
Trivial merge