diff options
author | Len Brown <len.brown@intel.com> | 2011-11-07 04:14:50 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-11-07 04:14:50 +0100 |
commit | efb90582c575084723cc14302c1300cb26c7e01f (patch) | |
tree | 25af70a2c40e7e404215acd9aadfa42e71e716ae /drivers/mtd/nand | |
parent | Merge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup'... (diff) | |
parent | cpuidle: Single/Global registration of idle states (diff) | |
parent | mrst pmu: update comment (diff) | |
parent | tools/power turbostat: less verbose debugging (diff) | |
download | linux-efb90582c575084723cc14302c1300cb26c7e01f.tar.xz linux-efb90582c575084723cc14302c1300cb26c7e01f.zip |
Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next