tree 25af70a2c40e7e404215acd9aadfa42e71e716ae
parent e751b759e82629798c4a5e4a87eb3a30c0510154
parent 46bcfad7a819bd17ac4e831b04405152d59784ab
parent 22f4521d664030e417f41953e922f61c65f2e189
parent aeae1e92daec5a38b40ad12598b97501b675a381
author Len Brown <len.brown@intel.com> 1320635690 -0500
committer Len Brown <len.brown@intel.com> 1320635690 -0500

Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next