Merge branches 'release' and 'dmi' into release
Len Brown [Thu, 7 Feb 2008 08:11:31 +0000 (03:11 -0500)]
1  2 
drivers/acpi/osl.c

Simple merge