diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-12 20:43:19 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-12 20:43:19 +0100 |
| commit | cc773e75a0e21deca6f7e6621a1a7bbc3ad92b88 (patch) | |
| tree | 25dc01af1a64246dcd7b12b83e8a73b80e10351d /include/linux/nvme.h | |
| parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) | |
| parent | 598da548ef78927c6e8a6baeed8072fa9db74ff1 (diff) | |
| download | op-kernel-dev-cc773e75a0e21deca6f7e6621a1a7bbc3ad92b88.zip op-kernel-dev-cc773e75a0e21deca6f7e6621a1a7bbc3ad92b88.tar.gz | |
Merge branch 'pm-domains'
* pm-domains:
PM / Domains: Fix compatible for domain idle state
PM / Domains: Do not print PM domain add error message if EPROBE_DEFER
PM / Domains: Fix a warning message
PM / Domains: check for negative return from of_count_phandle_with_args()
PM / doc: Update device documentation for devices in IRQ-safe PM domains
PM / Domains: Support IRQ safe PM domains
PM / Domains: Abstract genpd locking
dt/bindings / PM/Domains: Update binding for PM domain idle states
PM / Domains: Save the fwnode in genpd_power_state
PM / Domains: Allow domain power states to be read from DT
PM / Domains: Add residency property to genpd states
PM / Domains: Make genpd state allocation dynamic
Conflicts:
arch/arm/mach-imx/gpc.c
Diffstat (limited to 'include/linux/nvme.h')
0 files changed, 0 insertions, 0 deletions
