]> err.no Git - linux-2.6/commit
Pull d-states into release branch
authorLen Brown <len.brown@intel.com>
Wed, 25 Jul 2007 05:36:31 +0000 (01:36 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 25 Jul 2007 05:36:31 +0000 (01:36 -0400)
commitcb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4
tree2c52ac06cce163bf467d259119b824eed96f2eca
parent1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c
parent50ad147aa09c829cd452fae6ca99396c0b5b0695
Pull d-states into release branch

Conflicts:

drivers/acpi/sleep/main.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/sleep/main.c
include/acpi/acpi_bus.h