Pull platform-drivers into test branch

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

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

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

diff --cc drivers/usb/misc/appledisplay.c
Simple merge

diff --cc drivers/video/aty/aty128fb.c
Simple merge

diff --cc drivers/video/aty/atyfb_base.c
Simple merge

diff --cc drivers/video/backlight/backlight.c
Simple merge

diff --cc drivers/video/riva/fbdev.c
Simple merge