commit 9256a2d0b1a36906656405adf564f03ab2d2f3e9
author Linus Torvalds <torvalds@linux-foundation.org> Wed Aug 12 08:24:17 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Aug 12 08:24:17 2009 -0700
tree f82c1ed64b4c1fac1856d09c1ea0c8e62e357664
parent 1ae88b2e446261c038f2c0c3150ffae142b227a2
parent 5594639aab8b5614cb27a3e5b2b627505cbcd137

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: add workaround for on-board 5723s on some gigabyte boards
  ahci: Soften up the dmesg on SB600 PMP softreset failure recovery
  Documentation/kernel-parameters.txt: document libata's ignore_hpa option
  sata_nv: MSI support, disabled by default
  libata: OCZ Vertex can't do HPA
  pata_atiixp: fix second channel support
  pata_at91: fix resource release