From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Mar 2010 15:55:08 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
X-Git-Tag: firefly_0821_release~9833^2~3055
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6d6b89bd2e316b78d668f761d380837b81fa71ef;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
  virtio_net: remove forgotten assignment
  be2net: fix tx completion polling
  sis190: fix cable detect via link status poll
  net: fix protocol sk_buff field
  bridge: Fix build error when IGMP_SNOOPING is not enabled
  bnx2x: Tx barriers and locks
  scm: Only support SCM_RIGHTS on unix domain sockets.
  vhost-net: restart tx poll on sk_sndbuf full
  vhost: fix get_user_pages_fast error handling
  vhost: initialize log eventfd context pointer
  vhost: logging thinko fix
  wireless: convert to use netdev_for_each_mc_addr
  ethtool: do not set some flags, if others failed
  ipoib: returned back addrlen check for mc addresses
  netlink: Adding inode field to /proc/net/netlink
  axnet_cs: add new id
  bridge: Make IGMP snooping depend upon BRIDGE.
  bridge: Add multicast count/interval sysfs entries
  bridge: Add hash elasticity/max sysfs entries
  bridge: Add multicast_snooping sysfs toggle
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt
---

6d6b89bd2e316b78d668f761d380837b81fa71ef
diff --cc Documentation/feature-removal-schedule.txt
index 732b1fa48cf2,a0a4fd43e62d..73ef30dbe612
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -541,23 -520,10 +520,33 @@@ Who:	Hans de Goede <hdegoede@redhat.com
  
  ----------------------------
  
 +What:	corgikbd, spitzkbd, tosakbd driver
 +When:	2.6.35
 +Files:	drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
 +Why:	We now have a generic GPIO based matrix keyboard driver that
 +	are fully capable of handling all the keys on these devices.
 +	The original drivers manipulate the GPIO registers directly
 +	and so are difficult to maintain.
 +Who:	Eric Miao <eric.y.miao@gmail.com>
 +
 +----------------------------
 +
 +What:	corgi_ssp and corgi_ts driver
 +When:	2.6.35
 +Files:	arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c
 +Why:	The corgi touchscreen is now deprecated in favour of the generic
 +	ads7846.c driver. The noise reduction technique used in corgi_ts.c,
 +	that's to wait till vsync before ADC sampling, is also integrated into
 +	ads7846 driver now. Provided that the original driver is not generic
 +	and is difficult to maintain, it will be removed later.
 +Who:	Eric Miao <eric.y.miao@gmail.com>
++
++----------------------------
++
+ What:	capifs
+ When:	February 2011
+ Files:	drivers/isdn/capi/capifs.*
+ Why:	udev fully replaces this special file system that only contains CAPI
+ 	NCCI TTY device nodes. User space (pppdcapiplugin) works without
+ 	noticing the difference.
+ Who:	Jan Kiszka <jan.kiszka@web.de>