Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  leds: cr_bllcd.c: build fix
  backlight: Convert from struct class_device to struct device
  backlight: Fix order of Kconfig entries

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

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

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

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

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