1
linux/drivers/net/ethernet
Jiri Kosina e75d660672 Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c
2012-04-08 21:48:52 +02:00
..
3com Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
8390 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
adaptec
adi
aeroflex
alteon Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
amd Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
apple
atheros atlx: Use ETH_ALEN 2012-03-19 16:53:08 -04:00
broadcom bnx2x: Clear MDC/MDIO warning message 2012-04-04 18:24:23 -04:00
brocade Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-03-21 13:36:41 -07:00
cadence
calxeda
chelsio simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
cirrus Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
cisco
davicom
dec
dlink Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
emulex be2net: fix programming of VLAN tags for VF 2012-03-19 16:52:17 -04:00
faraday
freescale Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-02 17:53:39 -07:00
fujitsu Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hp
i825xx Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ibm powerpc+sparc/vio: Modernize driver registration 2012-03-28 11:33:24 +11:00
icplus
intel e1000e: Guarantee descriptor writeback flush success. 2012-04-03 15:25:16 -07:00
marvell sky2: copy received packets on inefficient unaligned architecture 2012-04-04 18:14:04 -04:00
mellanox mlx4: allocate just enough pages instead of always 4 pages 2012-04-04 20:34:29 -04:00
micrel Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
microchip
myricom
natsemi Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
neterion Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
nuvoton
nvidia Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
nxp net: lpc_eth: Fix rename of dev_hw_addr_random 2012-04-01 16:47:12 -04:00
octeon
oki-semi
packetengines
pasemi
qlogic qlcnic: Bug fix for LRO 2012-03-23 14:51:31 -04:00
racal
rdc
realtek Merge branch 'master' into for-next 2012-04-08 21:48:52 +02:00
renesas net: sh_eth: fix endian check for architecture independent 2012-04-01 23:22:11 -04:00
seeq Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sfc MTD merge for 3.4 2012-03-30 17:31:56 -07:00
sgi
silan
sis
smsc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
stmicro stmmac: re-add IFF_UNICAST_FLT for dwmac1000 2012-04-04 18:38:31 -04:00
sun Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
tehuti
ti cpsw: Hook up default ndo_change_mtu. 2012-03-20 00:33:59 -04:00
tile drivers/net/ethernet/tile: fix netdev_alloc_skb() bombing 2012-04-02 13:17:37 -04:00
toshiba
tundra Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
via via-rhine: fix wait-bit inversion. 2012-04-01 23:09:36 -04:00
xilinx
xircom Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
xscale
dnet.c
dnet.h
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig
korina.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
lantiq_etop.c
Makefile
mipsnet.c
netx-eth.c
s6gmac.c