diff options
author | Len Brown <len.brown@intel.com> | 2013-02-09 03:56:43 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2013-02-09 03:56:43 +0400 |
commit | 6018bf02381dbb2c77f65f923688ab8c8fdd6ed9 (patch) | |
tree | 7119e025f99bf5660a0f1cc229875f2cd21b9c6e /include/linux/cpuidle.h | |
parent | ac3ebafa81af76d65e4fb45c6388f08e90ddcc6d (diff) | |
parent | 748f11772154b58426c856b7d90538a9b60ae29a (diff) | |
parent | b1beab48f6148d50fee4a56d741cc3168fe1b995 (diff) | |
download | linux-6018bf02381dbb2c77f65f923688ab8c8fdd6ed9.tar.xz |
Merge branches 'acpi-idle', 'arm-idle' and 'intel-idle' into idle-remove-statedata