Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 18:19:46 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 18:19:46 +0000 (11:19 -0700)
commit2fe83b3ad12d43799af5f3156886eca443a88bac
tree1f09c2f0013f4742106f7b1732da6fdc45b18d39
parentdd6ccfe64dad4ea498392805b477308abef43a4c
parentce8c47cf88af4da2ff429933c07f203a55d5d0a1
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
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