Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --cc MAINTAINERS
index 14ad16d06c68fc4871a1f6b611ee44ade75bc635,35cf4373b15df79d472c9cd621f8cebac942047d..c84b7a9c9bafb510b01744e3ea2c70a34fed3013
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9957,7 -9820,13 +9957,12 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/usb/go7007/
  
+ GOCONTROLL MODULINE MODULE SLOT
+ M:    Maud Spierings <maudspierings@gocontroll.com>
+ S:    Maintained
+ F:    Documentation/connector/gocontroll,moduline-module-slot.yaml
+ 
  GOODIX TOUCHSCREEN
 -M:    Bastien Nocera <hadess@hadess.net>
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained

diff --cc include/linux/mtd/nand-qpic-common.h
Simple merge