From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jul 2019 16:25:04 +0000 (-0700)
Subject: Merge tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee... 
X-Git-Tag: v5.3-rc1~74
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=50950626414a982c8ed539128c7f69a3d328a970;p=linux-2.6-block.git

Merge tag 'backlight-next-5.3' of git://git./linux/kernel/git/lee/backlight

Pull backlight updates from Lee Jones:
 "New Functionality:
   - Provide support for ACPI enumeration; gpio_backlight

  Fix-ups:
   - SPDX fixups; pwm_bl
   - Fix linear	brightness levels to include number available; pwm_bl"

* tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: pwm_bl: Fix heuristic to determine number of brightness levels
  backlight: gpio_backlight: Enable ACPI enumeration
  backlight: pwm_bl: Convert to use SPDX identifier
---

50950626414a982c8ed539128c7f69a3d328a970
diff --cc drivers/video/backlight/pwm_bl.c
index 20d379ac8440,abfd1bca2c11..2201b8c78641
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@@ -1,8 -1,6 +1,6 @@@
 -// SPDX-License-Identifier: GPL-2.0
 +// SPDX-License-Identifier: GPL-2.0-only
  /*
-  * linux/drivers/video/backlight/pwm_bl.c
-  *
-  * simple PWM based backlight control, board code has to setup
+  * Simple PWM based backlight control, board code has to setup
   * 1) pin configuration so PWM waveforms can output
   * 2) platform_data being correctly configured
   */