From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 20 Feb 2007 18:17:32 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
X-Git-Tag: v2.6.21-rc1~52
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=a5527c6a586537c1af7ae6db30bb444ee4abdfe8;p=powerpc.git

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: Remove bogus SYSFS dependency
  backlight: simplify corgi_bl locking
  backlight: Separate backlight properties from backlight ops pointers
  backlight: Clean up pmac_backlight handling
  backlight: Improve backlight selection for fbdev drivers
  backlight: Rework backlight/fb interaction simplifying, lots
  backlight: Remove unneeded backlight update_status calls
  backlight: Remove uneeded update_status call from chipsfb.c
  backlight/fbcon: Add FB_EVENT_CONBLANK
  backlight: Fix Kconfig entries
  backlight: Remove uneeded nvidia set_power calls
  backlight: Convert semaphore -> mutex
  backlight: Fix external uses of backlight internal semaphore
  backlight: Minor code cleanups for hp680_bl.c
  backlight: Minor code cleanups for corgi_bl.c
  backlight: Remove excessive (un)likelys
  backlight: Remove unneeded owner field
  backlight: Fix error handling
  backlight: Add Frontpath ProGear HX1050+ driver
  backlight: Add maintainer entry
---

a5527c6a586537c1af7ae6db30bb444ee4abdfe8