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

..

ems_pci.c

can: sja1000: Add support for the new 4 channel EMS CPC-PCI cards

2009-07-23 18:01:02 -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: generic OF platform bus driver

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

sja1000_of_platform.c

can: sja1000_of_platform: fix build problems with printk format

2009-06-10 01:12:39 -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

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

2009-07-23 19:03:51 -07:00

sja1000.h

can: sja1000: stop misusing member base_addr of struct net_device

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