David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-12 21:59:18 -07:00
..
3com	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
8390	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
adaptec
adi
aeroflex	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
alteon
amd	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
apple	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
atheros	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
brocade	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
cadence
calxeda
chelsio	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
cirrus	cirrus: cs89x0: Remove function prototypes and reorder declarations	2012-05-18 23:48:07 -04:00
cisco	drivers/net: Convert compare_ether_addr to ether_addr_equal	2012-05-10 23:33:01 -04:00
davicom	dm9000: some coldfire boards need this	2012-05-14 18:40:16 -04:00
dec	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
dlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
emulex	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
faraday
freescale	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
fujitsu	drivers/net: delete all code/drivers depending on CONFIG_MCA	2012-05-17 16:37:41 -04:00
hp	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
i825xx	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
ibm	ehea: fix losing of NEQ events when one event occurred early	2012-05-10 22:45:54 -04:00
icplus
intel	ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled	2012-06-05 21:04:25 -07:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
mellanox	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
micrel	net/ethernet: ks8851_mll unregister_netdev() before freeing	2012-06-07 13:15:09 -07:00
microchip
myricom
natsemi	drivers/net: delete all code/drivers depending on CONFIG_MCA	2012-05-17 16:37:41 -04:00
neterion	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
nuvoton
nvidia	forcedeth: add transmit timestamping support	2012-04-30 21:33:27 -04:00
nxp	lpc_eth: fix tx completion	2012-06-11 13:12:33 -07:00
octeon
oki-semi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
packetengines
pasemi	net/pasemi: fix compiler warning	2012-05-02 20:52:48 -04:00
qlogic	qlcnic: Fix protcol type in case of inband vlan.	2012-06-07 13:18:54 -07:00
racal
rdc	r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)	2012-05-29 22:31:08 -04:00
realtek	r8169: avoid NAPI scheduling delay.	2012-06-10 20:21:07 -07:00
renesas	net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens	2012-05-29 17:30:08 -04:00
seeq
sfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
sgi	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
silan
sis
smsc	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
stmicro	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
sun	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
tehuti	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
ti	arm-soc: cleanups, part 2	2012-05-26 12:31:49 -07:00
tile	tilegx network driver: initial support	2012-06-11 17:01:26 -07:00
toshiba	drivers/net: Convert compare_ether_addr to ether_addr_equal	2012-05-10 23:33:01 -04:00
tundra
via	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
wiznet
xilinx
xircom
xscale
dnet.c
dnet.h
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
mipsnet.c
netx-eth.c
s6gmac.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00