David S. Miller 43154d08d6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/cpmac.c net/mac80211/mlme.c		2008-05-25 23:26:10 -07:00
..
6pack.c	6pack: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
baycom_epp.c	[PARPORT] Remove unused 'irq' argument from parport irq functions	2007-10-23 19:53:16 -04: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	baycom_ser_fdx: also allow i/o ports >= 0x1000 and enhanced failure logging	2007-04-28 11:01:02 -04:00
baycom_ser_hdx.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
bpqether.c	[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.	2008-03-26 04:39:53 +09:00
dmascc.c	hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c	2008-04-21 14:44:16 -07:00
hdlcdrv.c	[NET]: Move hardware header operations out of netdevice.	2007-10-10 16:52:52 -07:00
Kconfig	Documentation: Fix erroneous "dmascc=" documentation	2007-10-20 00:11:36 +02:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mkiss.c	tty: add throttle/unthrottle helpers	2008-04-30 08:29:47 -07:00
scc.c	hamradio/scc: add missing block braces to multi-statement if	2008-05-22 06:03:31 -04:00
yam1200.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
yam9600.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
yam.c	[NET]: Move hardware header operations out of netdevice.	2007-10-10 16:52:52 -07:00
z8530.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00