Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:48 +0000 (03:37 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:48 +0000 (03:37 -0500)
Conflicts:
include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge