tree 2c52ac06cce163bf467d259119b824eed96f2eca
parent 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c
parent 50ad147aa09c829cd452fae6ca99396c0b5b0695
author Len Brown <len.brown@intel.com> 1185341791 -0400
committer Len Brown <len.brown@intel.com> 1185341791 -0400

Pull d-states into release branch

Conflicts:

	drivers/acpi/sleep/main.c

Signed-off-by: Len Brown <len.brown@intel.com>