Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc drivers/char/hw_random/bcm2835-rng.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-quirks.c
index 0b1ed23,b9529be..16f0188
--- 1/drivers/hid/hid-quirks.c
--- 2/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@@ -176,7 -175,7 +176,8 @@@ static const struct hid_device_id hid_q
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET), HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+       { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_XENTA, USB_DEVICE_ID_AIRMOUSE_MX3), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
  
        { 0 }
  };

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge

diff --cc drivers/mmc/core/host.c
Simple merge

diff --cc drivers/mmc/core/quirks.h
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Simple merge

diff --cc drivers/opp/core.c
Simple merge

diff --cc drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_bcm2835aux.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge