Pull style into test branch

Conflicts:

	drivers/acpi/button.c
	drivers/acpi/ec.c
	drivers/acpi/osl.c
	drivers/acpi/sbs.c
This commit is contained in:
Len Brown 2006-12-16 01:04:27 -05:00
commit cece901481
28 changed files with 128 additions and 134 deletions