Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jun 2014 19:45:50 +0000 (12:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jun 2014 19:45:50 +0000 (12:45 -0700)
commitaf76004cf8b4f368583bda22d7e348e40a338b91
tree04b90663e2d2eede2b8051a7f7ff3a97073f50e5
parentbae14e7a2dcb726476b5020396923a24ccc4c40b
parentab1e59b4dc0370734ab3afb8de0c10a6f5a211ad
Merge tag 'backlight-for-linus-3.16' of git://git./linux/kernel/git/lee/backlight

Pull backlight fixes from Lee Jones:
 "This merely contains some very basic build/run-time bug fixes"

* tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: gpio-backlight: Fix warning when the GPIO is on a I2C chip
  video/backlight: s6e63m0: Fix string type mismatch
  video/backlight: LP8788 needs PWM
  video/backlight: LP855X needs PWM
  video/pxa: LCD_CORGI needs BACKLIGHT_CLASS_DEVICE
  video/backlight: LM3630A needs PWM