Skip to content
  • Linus Torvalds's avatar
    Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 02ebbbd4
    Linus Torvalds authored
    * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
      scsi: drop unused Kconfig symbol
      pci: drop unused Kconfig symbol
      stmmac: drop unused Kconfig symbol
      x86: drop unused Kconfig symbol
      powerpc: drop unused Kconfig symbols
      powerpc: 40x: drop unused Kconfig symbol
      mips: drop unused Kconfig symbols
      openrisc: drop unused Kconfig symbols
      arm: at91: drop unused Kconfig symbol
      samples: drop unused Kconfig symbol
      m32r: drop unused Kconfig symbol
      score: drop unused Kconfig symbols
      sh: drop unused Kconfig symbol
      um: drop unused Kconfig symbol
      sparc: drop unused Kconfig symbol
      alpha: drop unused Kconfig symbol
    
    Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
    as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
    should be deleted.
    02ebbbd4