David S. Miller 5c16807d3d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/netxen/netxen_nic_main.c		2009-08-13 19:59:44 -07:00
..
sja1000	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-23 19:03:51 -07:00
dev.c	can: fix oops caused by wrong rtnl newlink usage	2009-08-13 16:33:01 -07:00
Kconfig	can: sja1000: Add support for the new 4 channel EMS CPC-PCI cards	2009-07-23 18:01:02 -07:00
Makefile	can: Driver for the SJA1000 CAN controller	2009-05-18 15:41:41 -07:00
vcan.c