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

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/mmc/host/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