Merge branch 'pm-runtime'

* pm-runtime: (25 commits)
  i2c-omap / PM: Drop CONFIG_PM_RUNTIME from i2c-omap.c
  dmaengine / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  drivers: sh / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  e1000e / igb / PM: Eliminate CONFIG_PM_RUNTIME
  MMC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  MFD / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  misc / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  media / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  iio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  hsi / OMAP / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  i2c-hid / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  drm / exynos / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  gpio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  hwrandom / exynos / PM: Use CONFIG_PM in #ifdef
  block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  USB / PM: Drop CONFIG_PM_RUNTIME from the USB core
  PM: Merge the SET*_RUNTIME_PM_OPS() macros
  PM / Kconfig: Do not select PM directly from Kconfig files
  PCI / PM: Drop CONFIG_PM_RUNTIME from the PCI core
  ...

diff --cc drivers/acpi/device_pm.c
Simple merge

diff --cc drivers/base/power/domain.c
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/iio/accel/bmc150-accel.c
Simple merge

diff --cc drivers/iio/accel/kxcjk-1013.c
Simple merge

diff --cc drivers/iio/gyro/bmg160.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
index 388cfd83b6b667a8e40dffc6c61d9257839f2f81,f674abd76865905f28ed3636f2d45312cf0157a7..a7865c4b04980898b49317386ad6138aab051bc5
--- 1/drivers/usb/host/xhci-hub.c
--- 2/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@@ -1145,10 -1146,12 +1145,10 @@@ int xhci_bus_suspend(struct usb_hcd *hc
                        set_bit(port_index, &bus_state->bus_suspended);
                }
                /* USB core sets remote wake mask for USB 3.0 hubs,
-                * including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME
+                * including the USB 3.0 roothub, but only if CONFIG_PM
                 * is enabled, so also enable remote wake here.
                 */
 -              if (hcd->self.root_hub->do_remote_wakeup
 -                              && device_may_wakeup(hcd->self.controller)) {
 -
 +              if (hcd->self.root_hub->do_remote_wakeup) {
                        if (t1 & PORT_CONNECT) {
                                t2 |= PORT_WKOC_E | PORT_WKDISC_E;
                                t2 &= ~PORT_WKCONN_E;

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/pm.h
Simple merge

diff --cc include/linux/pm_domain.h
Simple merge

diff --cc kernel/power/Kconfig
Simple merge