diff options
author | Len Brown <len.brown@intel.com> | 2013-02-18 00:25:16 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2013-02-18 00:25:16 -0500 |
commit | 2e7d0f60d8b976c951621c1bc82acf0654089c0b (patch) | |
tree | be4eb1e6fb6bffd693191d502e58a5ea33b593e7 /arch/arm | |
parent | 57fa8273a246d6abbbfdc995da6293b0040807d8 (diff) | |
parent | 558bd3e8dc7a798c5c845f90cf038b9bbd2df2b8 (diff) | |
parent | 1ed51011af7450991780f9a7fd916554be19d2a3 (diff) | |
download | linux-2e7d0f60d8b976c951621c1bc82acf0654089c0b.tar.bz2 |
Merge branches 'idle-remove-statedata', 'pm_idle' and 'idle-hsw-turbostat' into release