summaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:13:13 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:13:13 -0500
commit70ec75c5b8e0bda7a16fb387f91e08545f379a0e (patch)
tree59a13092f566f89ce2cccbaecff487c82fc02564 /drivers/acpi/sleep
parent4f4ae0d42680889c62db4e1f3e6b4aa7787a7257 (diff)
parent2fdf07417e57136cf6baedf9508e2169a059ebea (diff)
parent23b168d425ca0ca25257ff8205a39f1c2d1b0f27 (diff)
Merge branches 'release', 'misc' and 'misc-2.6.25' into release