Merge linux-2.6 with linux-acpi-2.6