diff options
| author | Len Brown <len.brown@intel.com> | 2011-11-06 22:14:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-11-06 22:14:50 -0500 |
| commit | efb90582c575084723cc14302c1300cb26c7e01f (patch) | |
| tree | 25af70a2c40e7e404215acd9aadfa42e71e716ae /include/acpi | |
| parent | e751b759e82629798c4a5e4a87eb3a30c0510154 (diff) | |
| parent | 46bcfad7a819bd17ac4e831b04405152d59784ab (diff) | |
| parent | 22f4521d664030e417f41953e922f61c65f2e189 (diff) | |
| parent | aeae1e92daec5a38b40ad12598b97501b675a381 (diff) | |
| download | linux-efb90582c575084723cc14302c1300cb26c7e01f.tar.gz linux-efb90582c575084723cc14302c1300cb26c7e01f.tar.bz2 linux-efb90582c575084723cc14302c1300cb26c7e01f.zip | |
Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next