diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 03:08:47 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 03:08:47 +0300 |
| commit | 1e3f28a552c7acf6dd8acfe505beb4990e8cbd55 (patch) | |
| tree | c501d538faa010b2a503ab79aba104bf12e76a12 /drivers/acpi/acpica/acmacros.h | |
| parent | 989652871b06f1fb173bc5e8e2ea03bec8f8eeeb (diff) | |
| parent | d35818a9153e7f230fd65dc935e001a1b9bc08ff (diff) | |
| download | linux-1e3f28a552c7acf6dd8acfe505beb4990e8cbd55.tar.xz | |
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
Diffstat (limited to 'drivers/acpi/acpica/acmacros.h')
0 files changed, 0 insertions, 0 deletions