David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
ems_pci.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
ems_pcmcia.c	can: populate netdev::dev_id for udev discrimination	2014-03-17 09:20:16 +01:00
Kconfig	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
kvaser_pci.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
Makefile	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00
peak_pci.c	can: peak_pci: add PCI ID definition pcie card variant	2014-09-18 11:15:09 +02:00
peak_pcmcia.c	can: populate netdev::dev_id for udev discrimination	2014-03-17 09:20:16 +01:00
plx_pci.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
sja1000_isa.c	can: sja1000_isa: add locking for indirect register access mode	2014-04-24 22:22:53 +02:00
sja1000_platform.c	can: sja1000: of: add reg-io-width property for 8, 16 and 32-bit register access	2014-02-06 11:50:57 +01:00
sja1000.c	can: sja1000: Validate initialization state in start method	2014-08-21 10:49:34 +02:00
sja1000.h	can: sja1000: use common prefix for all sja1000 defines	2013-04-16 12:39:14 +02:00
tscan1.c	can: remove __dev* attributes	2012-12-03 11:16:11 -08:00