Rafael J. Wysocki 1e3f28a552 Merge branch 'acpi-soc' ... * acpi-soc: PM / clk: don't leave clocks enabled when driver not bound i2c: dw: Add APM X-Gene ACPI I2C device support ACPI / APD: Add APM X-Gene ACPI I2C device support ACPI / LPSS: change 'does not have' to 'has' in comment Revert "dmaengine: dw: platform: provide platform data for Intel" dmaengine: dw: return immediately from IRQ when DMA isn't in use dmaengine: dw: platform: power on device on shutdown ACPI / LPSS: override power state for LPSS DMA device ACPI / LPSS: power on when probe() and otherwise when remove() ACPI / LPSS: do delay for all LPSS devices when D3->D0 ACPI / LPSS: allow to use specific PM domain during ->probe() Revert "ACPI / LPSS: allow to use specific PM domain during ->probe()" device core: add BUS_NOTIFY_DRIVER_NOT_BOUND notification x86/platform/iosf_mbi: Remove duplicate definitions Conflicts: drivers/i2c/busses/i2c-designware-platdrv.c		2016-01-12 01:08:47 +01:00
..
intel_rapl.c	Merge branch 'acpi-soc'	2016-01-12 01:08:47 +01:00
Kconfig	powercap / RAPL: fix build dependency on iosf_mbi	2014-11-12 21:09:19 +01:00
Makefile
powercap_sys.c	PowerCap: Fix mode for energy counter	2013-12-05 02:05:48 +01:00