Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
commitac9f80ad16e6e934b6c1f12f82d27889c0f9abcc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 19:16:40 +0000 (24 12:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 19:16:40 +0000 (24 12:16 -0700)
tree5739a96e5e71e9863e332085e4368d0b99501bdb
parentc54554d388369f7f88ddcbe285ca96f7fb8a2d4b
parentf6ec2d96796d0accda6c325890206f3629130729
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: Fix missing kernel doc entry
  backlight: Add Nvidia-based Apple Macbook Pro backlight driver
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile