tree 8b051596111afec96c2fb687a57414340e76c4d5
parent 51558576ead54c1047e4d41440626e4f9aa015ea
parent bd17243a84632465f5403bc9eb8b4831bd67e582
author Linus Torvalds <torvalds@linux-foundation.org> 1213368057 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213368057 -0700

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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