linux-sg2042/net/rose
David S. Miller 230f9bb701 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2009-11-06 00:55:55 -08:00
..
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
af_rose.c net: pass kern to net_proto_family create function 2009-11-05 22:18:14 -08:00
rose_dev.c convert hamradio drivers to netdev_txreturnt_t 2009-09-01 01:13:12 -07:00
rose_in.c [ROSE]: Supress sparse warnings 2008-01-28 15:02:44 -08:00
rose_link.c [ROSE]: Eleminate HZ from ROSE kernel interfaces 2006-05-03 23:28:20 -07:00
rose_loopback.c [ROSE]: Fix rose.ko oops on unload 2007-10-07 23:44:17 -07:00
rose_out.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
rose_route.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-06 00:55:55 -08:00
rose_subr.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
rose_timer.c [ROSE]: rose_heartbeat_expiry() locking fix 2005-10-31 16:41:45 -02:00
sysctl_net_rose.c net: '&' redux 2008-11-03 18:21:05 -08:00