summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-01-23 19:47:06 -0500
committerLen Brown <len.brown@intel.com>2012-01-23 19:47:06 -0500
commiteb7004e623637a6c2b32317c000d4b617b5cb053 (patch)
tree57e5f9a709eea8e60eaadb6613f7b3012b591a6a /include/acpi
parent459413db33d6c99fc13d60f88899fb72d2530ed3 (diff)
parent99b725084450bbc6f8e1ab20a0df4cc291c342b5 (diff)
parent93f770846e8dedc5d9117bd4ad9d7efd18420627 (diff)
parent2d58d7ea9164da59d0ea82fdf80e3ababe52d58c (diff)
Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release