linux/drivers/net/ethernet
David S. Miller 88c5100c28 Merge branch 'master' of github.com:davem330/net
Conflicts:
	net/batman-adv/soft-interface.c
2011-10-07 13:38:43 -04:00
..
3com typhoon: convert to SKB paged frag API. 2011-09-22 16:04:17 -04:00
8390
adaptec starfire: convert to SKB paged frag API. 2011-09-22 16:04:15 -04:00
adi
aeroflex
alteon net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
amd drivers/net/ethernet: remove unused #define. 2011-10-03 14:09:10 -04:00
apple
atheros net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
broadcom Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
brocade bna: Multiple Definition and Interface Setup Fix 2011-10-04 23:04:01 -04:00
cadence
chelsio Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
cirrus
cisco net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
davicom
dec drivers/net/ethernet: remove unused #define. 2011-10-03 14:09:10 -04:00
dlink
emulex be2net: Making die temperature ioctl call async 2011-10-03 12:17:32 -04:00
faraday
freescale net/fec: add poll controller function for fec nic 2011-09-29 14:46:49 -04:00
fujitsu
hp
i825xx
ibm Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
icplus
intel igb: consolidate creation of Tx buffer info and data descriptor 2011-10-07 00:09:20 -07:00
marvell net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
mellanox
micrel
microchip
myricom net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
natsemi net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
neterion net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
nuvoton
nvidia net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
octeon
oki-semi Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
packetengines
pasemi net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
qlogic net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
racal
rdc
realtek sc92031: use standard #defines from mii.h. 2011-10-03 14:09:10 -04:00
renesas net: sh_eth: fix build failure 2011-10-03 13:52:28 -04:00
seeq seeq: fix compile breakage on s390 2011-09-23 13:45:47 -04:00
sfc net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
sgi
sis
smsc
stmicro stmmac: convert to SKB paged frag API. 2011-09-22 16:04:16 -04:00
sun net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
tehuti net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
ti
tile
toshiba
tundra tsi108: convert to SKB paged frag API. 2011-09-22 16:04:16 -04:00
via net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
xilinx
xircom
xscale
dnet.c
dnet.h
ethoc.c
fealnx.c
jme.c
jme.h drivers/net/ethernet: remove unused #define. 2011-10-03 14:09:10 -04:00
Kconfig
korina.c
lantiq_etop.c
Makefile
mipsnet.c
netx-eth.c
s6gmac.c