linux/drivers/net/can/sja1000
David S. Miller d07d4c239b Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.
2012-02-04 16:42:19 -05:00
..
Kconfig can: plx_pci: add support for IXXAT PCI cards 2012-02-03 01:21:25 +01:00
Makefile can/sja1000: add driver for EMS PCMCIA card 2011-09-28 13:41:50 -04:00
ems_pci.c Fix some #includes in CAN drivers (rebased for net-next-2.6) 2010-04-13 03:32:42 -07:00
ems_pcmcia.c can/sja1000: add driver for EMS PCMCIA card 2011-09-28 13:41:50 -04:00
kvaser_pci.c Fix some #includes in CAN drivers (rebased for net-next-2.6) 2010-04-13 03:32:42 -07:00
peak_pci.c can: peak_pci: Fix the way channels are linked together 2012-02-03 00:26:27 +01:00
plx_pci.c can: plx_pci: add support for IXXAT PCI cards 2012-02-03 01:21:25 +01:00
sja1000.c can: replace the dev_dbg/info/err/... with the new netdev_xxx macros 2012-02-03 01:21:26 +01:00
sja1000.h can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00
sja1000_isa.c can: sja1000_isa: convert to platform driver to support x86_64 systems 2011-11-29 18:35:51 -05:00
sja1000_of_platform.c net/can: convert drivers/net/can/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
sja1000_platform.c net/can: convert drivers/net/can/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
tscan1.c can: tscan1: add driver for TS-CAN1 boards 2010-10-24 15:26:48 -07:00