]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:57:27 +0000 (08:57 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:57:27 +0000 (08:57 -0700)
commit4d3fac08718b49fc256bdb447a479d089ca97b78
tree01bb670864df83f891c2b2a8eb576ad5c4b0bbe4
parent1f23f4209f2b99fdddf09821eead6364a6dd9654
parentedeb614c1c8388b354d93ff7790317cc5d6a38ec
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* '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