From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Apr 2012 19:58:29 +0000 (-0700)
Subject: Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.4-rc4~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=40df43a17f3c465988ae96e61e1b8a31b78b76c2;p=~emulex%2Finfiniband.git

Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Pull libara fixes from Jeff Garzik:

 - Notable regression fix.  Forbid dynamic runtime power management by
   default, due to issues with suspend/resume and hotplug.

   To re-enable, use sysfs.

 - make ata_print_id atomic, due to ref from multiple contexts

 - sata_mv warning fix

 - ata_piix new PCI ID

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: forbid port runtime pm by default, fixing regression
  libata: make ata_print_id atomic
  sata_mv: silence an uninitialized variable warning
  ata_piix: IDE-mode SATA patch for Intel DH89xxCC DeviceIDs
---

40df43a17f3c465988ae96e61e1b8a31b78b76c2