Merge remote-tracking branch 'origin/master' into h8300-next

diff --cc drivers/net/ethernet/smsc/Kconfig
index 64ca1b36b91e067d2109c1b8f4b94b8ac94b7dc0,6293b1e6c772077125319697bac0eda66b811629..056510def2b0f387e7628796216252c21c5ff260
--- 1/drivers/net/ethernet/smsc/Kconfig
--- 2/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@@ -37,9 -37,10 +37,9 @@@ config SMC91
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII
 -      depends on !OF || GPIOLIB
        depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \
                   MIPS || NIOS2 || SUPERH || XTENSA || H8300
-       ---help---
+       help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
          compiled into the kernel, and read the file

diff --cc drivers/tty/serial/sh-sci.c
Simple merge