Len Brown a733a5da97 Merge branches 'release' and 'fluff' into release
Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

Signed-off-by: Len Brown <len.brown@intel.com>
2008-02-07 03:38:22 -05:00
..
2008-02-06 10:41:08 -08:00
2008-02-06 10:41:02 -08:00
2008-02-05 09:44:24 -08:00
2008-02-06 10:41:08 -08:00
2008-02-06 10:41:02 -08:00
2008-02-05 14:37:15 -08:00
2008-02-06 10:41:01 -08:00
2008-02-06 10:41:08 -08:00
2008-02-06 10:41:02 -08:00