Pull events into release branch
authorLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 05:44:01 +0000 (01:44 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 05:44:01 +0000 (01:44 -0400)
commit25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9
treec42d40004e9668d83ab03ab7332515ef08683c54
parenta4fd4946214fae86610b989c47e5ae762cc96ddb
parent3e069ee0c30d6f28b79e409ef2df1ffa427897ae
Pull events into release branch

Conflicts:

drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/battery.c
drivers/acpi/thermal.c
drivers/acpi/video.c
drivers/misc/asus-laptop.c
drivers/misc/sony-laptop.c
drivers/pci/hotplug/acpiphp_ibm.c