David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-26 21:55:51 -05: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
Kconfig	can: plx_pci: add support for IXXAT PCI cards	2012-02-03 01:21:25 +01:00
kvaser_pci.c	Fix some #includes in CAN drivers (rebased for net-next-2.6)	2010-04-13 03:32:42 -07:00
Makefile	can/sja1000: add driver for EMS PCMCIA card	2011-09-28 13:41:50 -04: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05: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