David S. Miller cfadf853f6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/sh_eth.c

2009-10-27 01:03:26 -07:00

..

ems_pci.c

ems_pci: fix size of CAN controllers BAR mapping for CPC-PCI v2

2009-09-24 15:39:18 -07:00

kvaser_pci.c

can: sja1000: stop misusing member base_addr of struct net_device

2009-06-01 02:53:34 -07:00

Makefile

can: sja1000: legacy SJA1000 ISA bus driver

2009-09-04 02:16:16 -07:00

sja1000_isa.c

can: sja1000: legacy SJA1000 ISA bus driver

2009-09-04 02:16:16 -07:00

sja1000_of_platform.c

net: Fix OF platform drivers coldplug/hotplug when compiled as modules

2009-10-14 14:54:52 -07:00

sja1000_platform.c

can: sja1000: stop misusing member base_addr of struct net_device

2009-06-01 02:53:34 -07:00

sja1000.c

can: sja1000: fix bug using library functions for skb allocation

2009-10-27 01:02:33 -07:00

sja1000.h

can: make the number of echo skb's configurable

2009-10-13 03:44:04 -07:00