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

1  2 
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile

Simple merge
Simple merge