diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 22:15:43 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 22:15:43 (GMT) |
| commit | 4383822020c54c21eb2eb939a3233b44a51e8ca0 (patch) | |
| tree | 3bfc91336f7310e3b70058db85e28833067bc661 /net/nfc | |
| parent | bf900afba96bf34038bf2c944bbcad7424a40051 (diff) | |
| parent | b5d667eb392ed901fc7ae76869c7a130559e193c (diff) | |
| download | linux-4383822020c54c21eb2eb939a3233b44a51e8ca0.tar.xz | |
Merge branch 'acpi-pm' into fixes
* acpi-pm:
ACPI / PM: Take unusual configurations of power resources into account
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions