tree f93d3f88e038d176a4661639edbdb9a99d9f7402
parent 9209e4bd4b3b9ee3a104313b426380e8d1f59260
parent f7a297af49e5d9d2c577466307e8ef392750c9d9
author Linus Torvalds <torvalds@linux-foundation.org> 1261094287 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261094287 -0800

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: mbp_nvidia_bl - add two more MacBookPro variants
  backlight: Pass device through notify callback in the pwm driver
  backlight: PTR_ERR return of wrong pointer in cr_backlight_probe()
  backlight: Constify struct backlight_ops
  backlight/thinkpad-acpi: issue backlight class events

Fix up trivial conflicts in thinkpad-acpi support (backlight support
already merged earlier).