summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-01-24 01:47:06 +0100
committerLen Brown <len.brown@intel.com>2012-01-24 01:47:06 +0100
commiteb7004e623637a6c2b32317c000d4b617b5cb053 (patch)
tree57e5f9a709eea8e60eaadb6613f7b3012b591a6a
parentUse acpi_os_map_memory() instead of ioremap() in einj driver (diff)
parentACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores (diff)
parentACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist. (diff)
parentthermal: Rename generate_netlink_event (diff)
downloadlinux-eb7004e623637a6c2b32317c000d4b617b5cb053.tar.xz
linux-eb7004e623637a6c2b32317c000d4b617b5cb053.zip
Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release