summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-12-11 08:02:02 +0100
committerLen Brown <len.brown@intel.com>2010-12-11 08:02:02 +0100
commit6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 (patch)
tree55a32763c3406573054b8c1189b18b5c1ca0b1e9 /drivers/acpi/sleep.c
parentACPI: EC: Add another dmi match entry for MSI hardware (diff)
parentACPI battery: update status upon sysfs query (diff)
parentACPI / PM: Do not refcount power resources that can't be turned on (diff)
parentACPI/HEST: adjust section selection (diff)
parentACPI: fix allowing to add/remove multiple _OSI strings (diff)
downloadlinux-6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290.tar.xz
linux-6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290.zip
Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.6.37' and 'osi-regression' into release