f4991fcae0a2e08ed3bbea10d parent 25c68a33b7b74b37793b1250007e5e21d621a7fc parent 7d63c6759188b9b35c789159f6e02cd02d49ec7d author Len Brown 1166247907 -0500 committer Len Brown 1166247907 -0500 Pull trivial into test branch Conflicts: drivers/acpi/ec.c àµ`¹”,x