tree 1f09c2f0013f4742106f7b1732da6fdc45b18d39
parent dd6ccfe64dad4ea498392805b477308abef43a4c
parent ce8c47cf88af4da2ff429933c07f203a55d5d0a1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1185128386 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185128386 -0700

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