linux-next: manual merge of the modem-shm tree with the driver-coretree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the modem-shm tree got a conflict in
drivers/Kconfig between commit de55d8716ac5  ("Extcon (external
connector): import Android's switch class and modify") from the
driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and
Kconfig for M7400 Shared Memory Drivers") from the modem-shm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/Kconfig
index 0233ad9,918e943..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -136,6 +140,8 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
+ source "drivers/modem_shm/Kconfig"
+ 
  endmenu

Attachment: pgp00000.pgp
Description: PGP signature