linux_dsm_epyc7002/drivers/net/ethernet
Linus Torvalds 02ebbbd481 Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* '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.
2011-11-06 18:54:53 -08:00
..
3com
8390
adaptec
adi
aeroflex
alteon
amd Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
apple net/ethernet: Move mac89x0.c from apple to cirrus 2011-11-01 19:30:38 -04:00
atheros
broadcom bnx2x: update driver version to 1.70.30-0 2011-10-27 16:14:17 -04:00
brocade
cadence Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
chelsio
cirrus net/ethernet: Move mac89x0.c from apple to cirrus 2011-11-01 19:30:38 -04:00
cisco
davicom
dec
dlink
emulex be2net: Add detect UE feature for Lancer 2011-11-03 21:59:40 -04:00
faraday
freescale
fujitsu
hp
i825xx drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug 2011-11-01 00:53:33 -04:00
ibm ehea: fix skb_frag_size typo 2011-10-25 16:20:43 +02:00
icplus
intel ixgbevf: Update release version 2011-11-02 16:56:02 -07:00
marvell
mellanox Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2011-11-01 10:51:38 -07:00
micrel
microchip
myricom
natsemi
neterion
nuvoton
nvidia
octeon
oki-semi
packetengines
pasemi
qlogic qlcnic: fix beacon and LED test. 2011-10-30 03:09:41 -04:00
racal
rdc
realtek net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
renesas
seeq
sfc Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2011-10-28 14:20:44 -07:00
sgi
silan net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
sis
smsc
stmicro Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2011-11-06 18:54:53 -08:00
sun
tehuti
ti
tile
toshiba Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
tundra
via
xilinx net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c 2011-11-02 01:49:44 -04:00
xircom
xscale
dnet.c
dnet.h
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
korina.c
lantiq_etop.c
Makefile net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
mipsnet.c
netx-eth.c
s6gmac.c