linux/drivers/net/can
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
..
c_can can: c_can: remove duplicated #include 2011-07-23 20:01:15 -07:00
mscan Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
sja1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
softing Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
usb Fix common misspellings 2011-03-31 11:26:23 -03:00
at91_can.c can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00
bfin_can.c can: bfin_can: auto-calculate accessor sizes 2011-06-27 20:42:24 -07:00
dev.c candev: allow SJW user setting for bittiming calculation 2011-09-28 13:41:51 -04:00
flexcan.c flexcan: Prefer device tree clock frequency if available. 2011-08-17 20:36:38 -07:00
janz-ican3.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
Kconfig Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-07-05 23:23:37 -07:00
Makefile
mcp251x.c can: mcp251x: Allow pass IRQ flags through platform data. 2011-04-06 12:24:26 -07:00
pch_can.c treewide: fix a few typos in comments 2011-05-10 10:16:21 +02:00
slcan.c can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00
ti_hecc.c can: ti_hecc: include linux/io.h 2011-09-16 19:21:27 -04:00
vcan.c can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00