From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jul 2008 16:52:54 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.26-rc9~58
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a926c063738f31c8c8b5c2b883812a40e7868072;p=~shefty%2Frdma-dev.git

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:
  sata_mv: safer logic for limit_warnings
  libata-sff: improve HSM violation reporting
  ahci: always clear all bits in irq_stat
  sata_sil24: add DID for another adaptec flavor
  sata_uli: hardreset is broken
---

a926c063738f31c8c8b5c2b883812a40e7868072