Len Brown 463e7c7cf9 Pull trivial into test branch
Conflicts:

	drivers/acpi/ec.c
2006-12-16 00:45:07 -05:00
..
2006-12-16 00:45:07 -05:00
2006-12-12 09:11:45 +09:00
2006-12-12 17:41:41 -05:00