]> err.no Git - linux-2.6/commit
Pull style into test branch
authorLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 06:04:27 +0000 (01:04 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 06:04:27 +0000 (01:04 -0500)
commitcece901481bafbf14de8cbd3a89ae869ea881055
treef9e240443643008c8feeaf55919105dc63ab8c72
parentcfee47f99bc14a6d7c6b0be2284db2cef310a815
parent50dd096973f1d95aa03c6a6d9e148d706b62b68e
Pull style into test branch

Conflicts:

drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
13 files changed:
drivers/acpi/acpi_memhotplug.c
drivers/acpi/asus_acpi.c
drivers/acpi/battery.c
drivers/acpi/dock.c
drivers/acpi/glue.c
drivers/acpi/ibm_acpi.c
drivers/acpi/osl.c
drivers/acpi/pci_link.c
drivers/acpi/power.c
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/processor_perflib.c
drivers/acpi/sbs.c