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

..

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: switch carrier on if device was stopped while in bus-off state

2009-07-20 12:28:30 -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

…