David S. Miller 74d154189d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwmc3200wifi/netdev.c net/wireless/scan.c		2009-07-23 19:03:51 -07:00
..
6pack.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-23 19:03:51 -07:00
baycom_epp.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
baycom_par.c	[PARPORT] Remove unused 'irq' argument from parport irq functions	2007-10-23 19:53:16 -04:00
baycom_ser_fdx.c	drivers/net: use nr_irqs	2008-10-16 16:52:05 +02:00
baycom_ser_hdx.c
bpqether.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
dmascc.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
hdlcdrv.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
Kconfig	Documentation: Fix erroneous "dmascc=" documentation	2007-10-20 00:11:36 +02:00
Makefile
mkiss.c	Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines."	2009-07-14 13:13:41 -07:00
scc.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
yam.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
z8530.h