Merge branches 'release' and 'hwmon-conflicts' into release
Len Brown [Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)]
1  2 
drivers/acpi/osl.c
include/acpi/acpiosxf.h
include/linux/acpi.h

Simple merge
Simple merge
Simple merge