linux/drivers/net/can/sja1000
Linus Torvalds 8a9ea3237e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.
2011-10-25 13:25:22 +02: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/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
Makefile can/sja1000: add driver for EMS PCMCIA card 2011-09-28 13:41:50 -04:00
peak_pci.c can/sja1000: driver for PEAK PCAN PCI/PCIe cards 2011-09-21 02:29:02 -04:00
plx_pci.c drivers/net/can/sja1000/plx_pci.c: eliminate double free 2011-08-13 18:00:32 -07:00
sja1000_isa.c Fix some #includes in CAN drivers (rebased for net-next-2.6) 2010-04-13 03:32:42 -07:00
sja1000_of_platform.c doc: fix broken references 2011-09-27 18:08:04 +02:00
sja1000_platform.c can: sja1000 platform data fixes 2010-05-17 22:39:48 -07:00
sja1000.c can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00
sja1000.h can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00
tscan1.c can: tscan1: add driver for TS-CAN1 boards 2010-10-24 15:26:48 -07:00