Merge remote-tracking branch 'remoteproc/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Kconfig
index 742f0288b98f7666884e20c9ad83c9d97a8ed1bb,f901851db3b0bef203d87f0e5d8e72dac67932fc..d5138e6d8d9bfe60ac7df2edb90cb3398cd15c7b
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -134,10 -130,14 +134,14 @@@ source "drivers/clocksource/Kconfig
  
  source "drivers/iommu/Kconfig"
  
+ source "drivers/remoteproc/Kconfig"
+ 
+ source "drivers/rpmsg/Kconfig"
+ 
  source "drivers/virt/Kconfig"
  
 -source "drivers/hv/Kconfig"
 -
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/xshm/Kconfig"
 +
  endmenu

diff --cc drivers/Makefile
Simple merge

diff --cc include/linux/mod_devicetable.h
Simple merge