diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-19 11:08:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-19 11:08:43 -0700 |
| commit | f9764dd4d3befedba403fbb20d99566f4d26829d (patch) | |
| tree | 924fbe2b400d637469a836e357c16cd380de3f74 /drivers/power | |
| parent | 240206fcab661afe9bed72e8704cef1d6e83e338 (diff) | |
| parent | bb0925b283fe558fa9530c9d0b6158e9b6c9dfa6 (diff) | |
| download | linux-f9764dd4d3befedba403fbb20d99566f4d26829d.tar.gz linux-f9764dd4d3befedba403fbb20d99566f4d26829d.tar.bz2 linux-f9764dd4d3befedba403fbb20d99566f4d26829d.zip | |
Merge tag 'char-misc-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are four small misc driver fixes for 5.1-rc6.
Nothing major at all, they fix up a Kconfig issues, a SPDX invalid
license tag, and two tiny bugfixes.
All have been in linux-next for a while with no reported issues"
* tag 'char-misc-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
drivers: power: supply: goldfish_battery: Fix bogus SPDX identifier
extcon: ptn5150: fix COMPILE_TEST dependencies
misc: fastrpc: add checked value for dma_set_mask
habanalabs: remove low credit limit of DMA #0
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/goldfish_battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/goldfish_battery.c b/drivers/power/supply/goldfish_battery.c index ad969d9fc981..c2644a9fe80f 100644 --- a/drivers/power/supply/goldfish_battery.c +++ b/drivers/power/supply/goldfish_battery.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL +// SPDX-License-Identifier: GPL-2.0 /* * Power supply driver for the goldfish emulator * |