diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:43:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:43:16 +0200 |
| commit | e35db92b4f53cad816af25c1a5f8be414e0de9fc (patch) | |
| tree | 2b93f1cbd2f305908a4aefa13cd6c9e9d421702c /drivers/hwmon/ina3221.c | |
| parent | 7005f6dc69948685b846c895e80fca2646476b83 (diff) | |
| parent | af48d7bc3756a0cd882d65bff14ab39746ba57fe (diff) | |
| parent | a4ee4545932d4b26ec0c190f2ce265de79990c7a (diff) | |
| parent | e2cdeaa1232d41b2b8d2da67490f609ac0b7b0dc (diff) | |
| download | linux-e35db92b4f53cad816af25c1a5f8be414e0de9fc.tar.bz2 | |
Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-avs'
* pm-cpuidle:
ARM: cpuidle: Fix error return code
* pm-opp:
PM / OPP: Don't support OPP if it provides supported-hw but platform does not
PM / OPP: avoid maybe-uninitialized warning
* pm-avs:
PM / AVS: SmartReflex: Neaten logging