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
..
appletalk	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
arcnet
bonding	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
caif
can	can: c_can: Add support for Bosch D_CAN controller	2012-06-07 10:02:27 +02:00
cris
dsa
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
fddi	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
hamradio	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
hippi
hyperv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-06 15:06:41 -07:00
irda	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
plip
ppp	ppp: avoid false drop_monitor false positives	2012-05-19 02:32:30 -04:00
slip	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
team
usb	usbnet: don't initialize transfer buffer before submit status URB	2012-06-12 18:51:08 -07:00
vmxnet3	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
wan	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
wimax	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
xen-netback	xen/netback: Calculate the number of SKB slots required correctly	2012-05-24 16:22:53 -04:00
dummy.c	dummy: fix rcu_sched self-detected stalls	2012-06-11 01:12:04 -07:00
eql.c
ifb.c
Kconfig	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
LICENSE.SRC
loopback.c
macvlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
macvtap.c	macvtap: use prepare_to_wait/finish_wait to ensure mb	2012-06-07 13:18:54 -07:00
Makefile	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
mdio.c
mii.c
netconsole.c
rionet.c
sb1000.c
Space.c	drivers/net: delete all code/drivers depending on CONFIG_MCA	2012-05-17 16:37:41 -04:00
sungem_phy.c
tun.c	drivers/net: Convert compare_ether_addr to ether_addr_equal	2012-05-10 23:33:01 -04:00
veth.c
virtio_net.c	virtio-net: fix a race on 32bit arches	2012-06-10 20:23:20 -07:00
xen-netfront.c	xen: do not disable netfront in dom0	2012-05-22 16:50:28 -04:00