Merge remote-tracking branch 'drop-experimental/linux-next'

Conflicts:
	drivers/net/ethernet/intel/Kconfig
	drivers/ptp/Kconfig

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/um/Kconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

diff --cc drivers/net/ethernet/intel/Kconfig
Simple merge

diff --cc drivers/net/ethernet/ti/Kconfig
Simple merge

diff --cc drivers/net/usb/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge

diff --cc net/sctp/Kconfig
Simple merge