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

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

diff --cc Documentation/devicetree/bindings/staging/dwc2.txt
index a1753ed0dd84cf534a1536bf016f5f17d2d675c2,8b60e90efe33dababfd1854cf2ad3f4203e20dea..b8b6871f116f39ef770c9ecabcf33b0abca517e0
--- 1/Documentation/devicetree/bindings/staging/dwc2.txt
--- 2/Documentation/devicetree/bindings/staging/dwc2.txt
+++ b/Documentation/devicetree/bindings/staging/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 drivers/staging/dwc2/hcd.c
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/ozwpan/ozproto.c
Simple merge

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