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
Showing
- arch/arm/kernel/perf_event.c 1 addition, 1 deletionarch/arm/kernel/perf_event.c
- arch/arm/mach-davinci/pm_domain.c 1 addition, 1 deletionarch/arm/mach-davinci/pm_domain.c
- arch/arm/mach-exynos/Kconfig 1 addition, 1 deletionarch/arm/mach-exynos/Kconfig
- arch/arm/mach-keystone/pm_domain.c 1 addition, 1 deletionarch/arm/mach-keystone/pm_domain.c
- arch/arm/mach-omap1/pm_bus.c 2 additions, 2 deletionsarch/arm/mach-omap1/pm_bus.c
- arch/arm/mach-omap2/io.c 1 addition, 1 deletionarch/arm/mach-omap2/io.c
- arch/arm/mach-omap2/omap_device.c 1 addition, 1 deletionarch/arm/mach-omap2/omap_device.c
- arch/ia64/Kconfig 1 addition, 1 deletionarch/ia64/Kconfig
- arch/x86/kernel/apic/io_apic.c 1 addition, 1 deletionarch/x86/kernel/apic/io_apic.c
- drivers/ata/Kconfig 1 addition, 1 deletiondrivers/ata/Kconfig
- drivers/media/platform/Kconfig 1 addition, 1 deletiondrivers/media/platform/Kconfig
- drivers/media/platform/s5p-tv/Kconfig 1 addition, 1 deletiondrivers/media/platform/s5p-tv/Kconfig
- drivers/mmc/host/atmel-mci.c 1 addition, 1 deletiondrivers/mmc/host/atmel-mci.c
- drivers/nfc/trf7970a.c 1 addition, 1 deletiondrivers/nfc/trf7970a.c
- drivers/phy/phy-omap-usb2.c 1 addition, 1 deletiondrivers/phy/phy-omap-usb2.c
- drivers/phy/phy-ti-pipe3.c 1 addition, 1 deletiondrivers/phy/phy-ti-pipe3.c
- drivers/power/pm2301_charger.c 0 additions, 4 deletionsdrivers/power/pm2301_charger.c
- drivers/scsi/scsi_pm.c 0 additions, 10 deletionsdrivers/scsi/scsi_pm.c
- drivers/scsi/scsi_priv.h 2 additions, 3 deletionsdrivers/scsi/scsi_priv.h
- drivers/scsi/ufs/ufshcd-pci.c 4 additions, 7 deletionsdrivers/scsi/ufs/ufshcd-pci.c
Loading
Please register or sign in to comment