Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Mar 2007 16:25:43 +0000 (08:25 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Mar 2007 16:25:43 +0000 (08:25 -0800)
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: Allow enable/disable of fb backlights, fixing regressions
  backlight: Fix nvidia backlight initial brightness

1  2 
drivers/video/aty/atyfb_base.c

Simple merge