Pull trivial into test branch
authorLen Brown <len.brown@intel.com>
Sat, 3 Feb 2007 06:39:07 +0000 (01:39 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 3 Feb 2007 06:39:07 +0000 (01:39 -0500)
Conflicts:

drivers/acpi/scan.c

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

Trivial merge