Merge branch 'acpica' into release

diff --cc drivers/acpi/container.c
Simple merge

diff --cc drivers/acpi/dock.c
Simple merge

diff --cc drivers/acpi/glue.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/char/agp/hp-agp.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge