diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-02 23:38:30 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-02 23:38:30 +0300 |
| commit | b654c62e7734cdcd507a5751cd940077be2ad373 (patch) | |
| tree | 098a01c82ce18bf4a27a20c181d6d58da0e72a30 /fs/orangefs/orangefs-dev-proto.h | |
| parent | bd37e022e334757a5dc1dae41baa29e16befe4ec (diff) | |
| parent | d7737ce964d944dd07e25b0f569edcd550ede18c (diff) | |
| download | linux-b654c62e7734cdcd507a5751cd940077be2ad373.tar.xz | |
Merge branches 'pm-cpufreq-fixes' and 'pm-core-fixes'
* pm-cpufreq-fixes:
cpufreq: dt: Add terminate entry for of_device_id tables
* pm-core-fixes:
PM / runtime: Add _rcuidle suffix to allow rpm_idle() use from idle
PM / runtime: Add _rcuidle suffix to allow rpm_resume() to be called from idle
Diffstat (limited to 'fs/orangefs/orangefs-dev-proto.h')
0 files changed, 0 insertions, 0 deletions