Merge tag 'backlight-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2015 15:56:21 +0000 (08:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2015 15:56:21 +0000 (08:56 -0700)
Pull backlight fix from Lee Jones:
 "One simple fix to correctly handle -EPROBE_DEFER"

* tag 'backlight-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: pwm: Handle EPROBE_DEFER while requesting the PWM


Trivial merge