diff options
| author | Len Brown <len.brown@intel.com> | 2014-04-04 13:05:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2014-04-04 13:05:22 -0400 |
| commit | 23a299cd93781a190cdca0d7d16034837b7dfd86 (patch) | |
| tree | 2d53995f30b311038e8273e081804e5c734db2fa /arch | |
| parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) | |
| parent | 4e8e863fed2e82278d29c6357de8251adb73acb9 (diff) | |
| parent | 0138d8f0755b5b28d0acdb0a758bcfcaf441fc58 (diff) | |
| download | linux-23a299cd93781a190cdca0d7d16034837b7dfd86.tar.gz linux-23a299cd93781a190cdca0d7d16034837b7dfd86.tar.bz2 linux-23a299cd93781a190cdca0d7d16034837b7dfd86.zip | |
Merge branches 'turbostat' and 'intel_idle' into release