summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-03-18 04:52:57 -0400
committerLen Brown <len.brown@intel.com>2008-03-18 04:52:57 -0400
commitd9ea1364d37b53710519909ab125a53b0a8ca64f (patch)
treec8c2cbe0be291ec398af242fc349d3d28a6c933e /drivers/acpi
parentabc5a87f4e627e058813a95b112e9f5f21668f9d (diff)
parentb8a1bdb14940946fcf0438a6337b2a6c54294fb8 (diff)
parent77321e624b64f1e5985a20f3cd16b94c96d0dbb4 (diff)
parent0ac4a3c2fbbcadc3e96e4dc47d4ae802d66e6f67 (diff)
parent71e93d15612c61c2e26a169567becf088e71b8ff (diff)
parentece54e2ff45062852e4647e85b2bb5f6aee8211c (diff)
Merge branches 'release', 'asus', 'bugzilla-8573', 'bugzilla-9995', 'bugzilla-10272', 'lockdep' and 'thermal' into release