Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/b44.c | 64 ++++++---------
drivers/net/bnx2.c | 2
drivers/net/hydra.h | 177 ------------------------------------------
drivers/net/ixgb/ixgb_main.c | 13 ++-
drivers/net/mv643xx_eth.c | 19 +++-
drivers/net/natsemi.c | 2
drivers/net/pcmcia/axnet_cs.c | 2
drivers/net/skge.c | 2
drivers/net/sky2.c | 6 -
drivers/net/sky2.h | 2
drivers/net/starfire.c | 2
drivers/net/typhoon.c | 2
drivers/net/via-rhine.c | 7 -
13 files changed, 67 insertions(+), 233 deletions(-)
Adrian Bunk:
drivers/net/via-rhine.c: make a function static
remove drivers/net/hydra.h
Andreas Schwab:
Use pci_set_consistent_dma_mask in ixgb driver
Brent Cook:
mv643xx_eth: Always free completed tx descs on tx interrupt
Dale Farnsworth:
mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
Gary Zambrano:
b44: disable default tx pause
b44: increase version to 1.00
Jeff Garzik:
[netdrvr b44] trim trailing whitespace
Komuro:
network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
Randy Dunlap:
net drivers: fix section attributes for gcc
Roger Luethi:
via-rhine: execute bounce buffers code on Rhine-I only
Stephen Hemminger:
dlink pci cards using wrong driver
sky2: bad memory reference on dual port cards