From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 26 Sep 2007 15:57:27 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.12-rc1~26824
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d3fac08718b49fc256bdb447a479d089ca97b78;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-linus' of /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
---

4d3fac08718b49fc256bdb447a479d089ca97b78