From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Nov 2011 01:55:01 +0000 (-0200)
Subject: Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
X-Git-Tag: v3.2-rc2~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=87618e0003dbca0f51f1ef52fa4199bd65212f41;p=~emulex%2Finfiniband.git

Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  pata_of_platform: Don't use NO_IRQ
  [libata] ahci: Add ASMedia ASM1061 support
  [libata] Issue SRST to Sil3726 PMP
  sata_sis.c: trivial spelling fix
  ahci_platform: use dev_get_platdata()
  [libata] libata-scsi.c: Add function parameter documentation
---

87618e0003dbca0f51f1ef52fa4199bd65212f41