projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1f23f42
edeb614
)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:57:27 +0000
(08:57 -0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:57:27 +0000
(08:57 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode()
sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used
Trivial merge