Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
Linus Torvalds [Sun, 22 Jul 2007 18:19:46 +0000 (11:19 -0700)]
* '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

1  2 
drivers/acpi/video.c
drivers/usb/misc/appledisplay.c
drivers/video/aty/atyfb_base.c
drivers/video/backlight/cr_bllcd.c
drivers/video/riva/fbdev.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge