Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/imx-drm/imx-drm-core.c

diff --cc Documentation/devicetree/bindings/i2c/trivial-devices.txt
Simple merge

diff --cc Documentation/devicetree/bindings/usb/dwc2.txt
index a1753ed0dd84cf534a1536bf016f5f17d2d675c2,8b60e90efe33dababfd1854cf2ad3f4203e20dea..b8b6871f116f39ef770c9ecabcf33b0abca517e0
--- 1/Documentation/devicetree/bindings/staging/dwc2.txt
--- 2/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@@ -2,17 -2,11 +2,19 @@@ Platform DesignWare HS OTG USB 2.0 cont
  -----------------------------------------------------
  
  Required properties:
- - compatible : "snps,dwc2"
+ - compatible : One of:
+   - brcm,bcm2835-usb: The DWC2 USB controller instance in the BCM2835 SoC.
+   - snps,dwc2: A generic DWC2 USB controller with default parameters.
  - reg : Should contain 1 register range (address and length)
  - interrupts : Should contain 1 interrupt
 +- clocks: clock provider specifier
 +- clock-names: shall be "otg"
 +Refer to clk/clock-bindings.txt for generic clock consumer properties
 +
 +Optional properties:
 +- phys: phy provider specifier
 +- phy-names: shall be "device"
 +Refer to phy/phy-bindings.txt for generic phy consumer properties
  
  Example:
  

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/lloop.c
Simple merge

diff --cc drivers/staging/media/as102/as102_drv.c
Simple merge

diff --cc drivers/staging/media/go7007/go7007-usb.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge

diff --cc drivers/staging/ozwpan/ozproto.c
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/os_intfs.c
Simple merge

diff --cc drivers/staging/usbip/usbip_common.c
Simple merge

diff --cc drivers/usb/Kconfig
index a34fb9846417cff4966fa5fb9b6ab5bea5f7da48,7eb909aa8bc0f403518305dc5ba43702788952b4..2e6b832e004ba4926aaa1d870d7a1a01345dc8ac
--- 1/drivers/usb/Kconfig
--- 2/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -104,10 -106,10 +104,12 @@@ source "drivers/usb/image/Kconfig
  
  endif
  
 +source "drivers/usb/musb/Kconfig"
 +
  source "drivers/usb/dwc3/Kconfig"
  
+ source "drivers/usb/dwc2/Kconfig"
+ 
  source "drivers/usb/chipidea/Kconfig"
  
  comment "USB port drivers"

diff --cc drivers/usb/dwc2/hcd.c
Simple merge