From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Dec 2014 17:44:05 +0000 (+0100)
Subject: Merge branch 'pm-runtime'
X-Git-Tag: v3.19-rc1~26^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=035f10ee4e978db0a01d0f832e328b4a62f8310e;p=~emulex%2Finfiniband.git

Merge branch 'pm-runtime'

* pm-runtime:
  power / PM: Eliminate CONFIG_PM_RUNTIME
  NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
  PM: Remove the SET_PM_RUNTIME_PM_OPS() macro
  mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
  PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
  ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
---

035f10ee4e978db0a01d0f832e328b4a62f8310e