summaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-06-04 08:48:41 +0400
committerLen Brown <len.brown@intel.com>2012-06-04 08:48:41 +0400
commitd3514abcf5b896a3a66d8b7c960a0018a52ebc2c (patch)
tree482b5f5b6f5210a89bc3239c1a0001f28d35e894 /drivers/acpi/sleep.c
parentc5971456964290da7e98222892797b71ef793e62 (diff)
parent7ae30986dc63d214cb075a40f2cf205f0a7806cd (diff)
parentdbe9a2edd17d843d80faf2b99f20a691c1853418 (diff)
parent650a37f32d2bc16fa802075be579802bc4ec4132 (diff)
parent7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a (diff)
parentd8e725f356fd5f225ad97f21213fc007e409c9f5 (diff)
downloadlinux-d3514abcf5b896a3a66d8b7c960a0018a52ebc2c.tar.xz
Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release
bug fixes Signed-off-by: Len Brown <len.brown@intel.com>