]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge 5.2-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2019 07:11:21 +0000 (09:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2019 07:11:21 +0000 (09:11 +0200)
commit0154ec71d597692a0d0682b19eac4b3adfb7f3dc
tree121b4ac35146f5696da090d3ae2534c76523e6c2
parent9c3cef54c50d93871eaa46c28a06de8bd03fab63
parentd1fdb6d8f6a4109a4263176c84b899076a5f8008
Merge 5.2-rc4 into char-misc-next

We want the char/misc driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20 files changed:
MAINTAINERS
drivers/char/bsr.c
drivers/firmware/google/coreboot_table.h
drivers/firmware/google/framebuffer-coreboot.c
drivers/firmware/google/memconsole-coreboot.c
drivers/firmware/google/memconsole.c
drivers/firmware/google/vpd.c
drivers/firmware/google/vpd_decode.c
drivers/misc/Kconfig
drivers/misc/altera-stapl/Kconfig
drivers/misc/c2port/Kconfig
drivers/misc/cb710/Kconfig
drivers/misc/cxl/Kconfig
drivers/misc/echo/Kconfig
drivers/misc/eeprom/ee1004.c
drivers/misc/genwqe/Kconfig
drivers/misc/lis3lv02d/Kconfig
drivers/misc/ocxl/Kconfig
include/linux/vmw_vmci_defs.h
mm/balloon_compaction.c