From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Mar 2013 19:33:36 +0000 (-0700)
Subject: Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.9-rc4~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c8c1f16717b05a9f787e054ada1ddd6dbb910364;p=~emulex%2Finfiniband.git

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

Pull libata updates from Jeff Garzik:
 "Simple stuff.  See one-line summaries."

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_samsung_cf: use module_platform_driver_probe()
  [libata] Avoid specialized TLA's in ZPODD's Kconfig
  libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
  sata_fsl: Remove redundant NULL check before kfree
  ahci: Add Device IDs for Intel Wellsburg PCH
  ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
---

c8c1f16717b05a9f787e054ada1ddd6dbb910364