Merge remote-tracking branch 'modem-shm/for-next'

Conflicts:
	drivers/Kconfig

diff --cc drivers/Kconfig
index 57d6fd6074f7172c3e03f52f2af5514bbe58d885,918e943312c1c691cebea3b0e6cf78b67b42c36a..f917ebfa972eb05cd9aa2df95c0e54dd2d0d01ed
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,10 -136,6 +140,12 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
 +source "drivers/iio/Kconfig"
 +
 +source "drivers/vme/Kconfig"
 +
+ source "drivers/modem_shm/Kconfig"
+ 
  endmenu

diff --cc drivers/Makefile
Simple merge

diff --cc include/linux/Kbuild
Simple merge