Merge linux-2.6 into linux-acpi-2.6 test