Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2008 14:40:57 +0000 (07:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2008 14:40:57 +0000 (07:40 -0700)
commitfa8d84b78be10d0c455dd716f40152bb7003bd5b
tree8b051596111afec96c2fb687a57414340e76c4d5
parent51558576ead54c1047e4d41440626e4f9aa015ea
parentbd17243a84632465f5403bc9eb8b4831bd67e582
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: Workaround HW bug for SB600/700 SATA controller PMP support
  ahci: workarounds for mcp65