Merge branch 'acpi' of git://github.com/lenb/linux