Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (183 commits)
  [TG3]: Update version to 3.78.
  [TG3]: Add missing NVRAM strapping.
  [TG3]: Enable auto MDI.
  [TG3]: Fix the polarity bit.
  [TG3]: Fix irq_sync race condition.
  [NET_SCHED]: ematch: module autoloading
  [TCP]: tcp probe wraparound handling and other changes
  [RTNETLINK]: rtnl_link: allow specifying initial device address
  [RTNETLINK]: rtnl_link API simplification
  [VLAN]: Fix MAC address handling
  [ETH]: Validate address in eth_mac_addr
  [NET]: Fix races in net_rx_action vs netpoll.
  [AF_UNIX]: Rewrite garbage collector, fixes race.
  [NETFILTER]: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr dereference (CVE-2007-2876)
  [NET]: Make all initialized struct seq_operations const.
  [UDP]: Fix length check.
  [IPV6]: Remove unneeded pointer idev from addrconf_cleanup().
  [DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h
  [IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.
  [IPV6]: Do not send RH0 anymore.
  ...

Fixed up trivial conflict in Documentation/feature-removal-schedule.txt
manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --combined Documentation/feature-removal-schedule.txt
index 281458b47d75689b8141ee3e79c25f492f18999d,062fc2e79c8610034a5555c5108f75c1430e4b97..0599a0c7c026174dce41b5a91f431f2919d95504
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -262,25 -262,6 +262,6 @@@ Who:      Richard Purdie <rpurdie@rpsys.net
  
  ---------------------------
  
- What: Multipath cached routing support in ipv4
- When: in 2.6.23
- Why:  Code was merged, then submitter immediately disappeared leaving
-       us with no maintainer and lots of bugs.  The code should not have
-       been merged in the first place, and many aspects of it's
-       implementation are blocking more critical core networking
-       development.  It's marked EXPERIMENTAL and no distribution
-       enables it because it cause obscure crashes due to unfixable bugs
-       (interfaces don't return errors so memory allocation can't be
-       handled, calling contexts of these interfaces make handling
-       errors impossible too because they get called after we've
-       totally commited to creating a route object, for example).
-       This problem has existed for years and no forward progress
-       has ever been made, and nobody steps up to try and salvage
-       this code, so we're going to finally just get rid of it.
- Who:  David S. Miller <davem@davemloft.net>
- 
- ---------------------------
- 
  What: read_dev_chars(), read_conf_data{,_lpm}() (s390 common I/O layer)
  When: December 2007
  Why:  These functions are a leftover from 2.4 times. They have several
@@@ -330,10 -311,11 +311,18 @@@ Who:  Tejun Heo <htejun@gmail.com
  
  ---------------------------
  
 +What: Legacy RTC drivers (under drivers/i2c/chips)
 +When: November 2007
 +Why:  Obsolete. We have a RTC subsystem with better drivers.
 +Who:  Jean Delvare <khali@linux-fr.org>
 +
 +---------------------------
 +
+ What: iptables SAME target
+ When: 1.1. 2008
+ Files:        net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h
+ Why:  Obsolete for multiple years now, NAT core provides the same behaviour.
+       Unfixable broken wrt. 32/64 bit cleanness.
+ Who:  Patrick McHardy <kaber@trash.net>
+ 
+ ---------------------------

diff --combined MAINTAINERS
index 3db68bf1d2134a9f4c870d3de1f9ff1b69c6e6ba,fcfe598b8d743f4a4c773089409386fcf39826de..cba5f4df0e21e000c2bedd8c43ca15a6283b5175
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1750,8 -1750,8 +1750,8 @@@ T:      http://www.harbaum.org/till/i2c_tiny
  S:    Maintained
  
  i386 BOOT CODE
 -P:    Riley H. Williams
 -M:    Riley@Williams.Name
 +P:    H. Peter Anvin
 +M:    hpa@zytor.com
  L:    Linux-Kernel@vger.kernel.org
  S:    Maintained
  
@@@ -2903,6 -2903,11 +2903,11 @@@ P:    Michal Ostrowsk
  M:    mostrows@speakeasy.net
  S:    Maintained
  
+ PPP OVER L2TP
+ P:    James Chapman
+ M:    jchapman@katalix.com
+ S:    Maintained
+ 
  PREEMPTIBLE KERNEL
  P:    Robert Love
  M:    rml@tech9.net

diff --combined drivers/net/Kconfig
index 80572e2c9dab2ef93f8c2551bd25b56cec04a1c3,d4e39ff1545b5a698de24fa6f053aa8a28508d2d..ba314adf68b86ecf856a6ebecada8c2ef019feb9
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -25,6 -25,14 +25,14 @@@ menuconfig NETDEVICE
  # that for each of the symbols.
  if NETDEVICES
  
+ config NETDEVICES_MULTIQUEUE
+       bool "Netdevice multiple hardware queue support"
+       ---help---
+         Say Y here if you want to allow the network stack to use multiple
+         hardware TX queues on an ethernet device.
+ 
+         Most people will say N here.
+ 
  config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT
@@@ -877,7 -885,7 +885,7 @@@ config NET_NET
  
  config DM9000
        tristate "DM9000 support"
 -      depends on ARM || MIPS
 +      depends on ARM || BLACKFIN || MIPS
        select CRC32
        select MII
        ---help---
@@@ -2784,6 -2792,19 +2792,19 @@@ config PPPOAT
          which can lead to bad results if the ATM peer loses state and
          changes its encapsulation unilaterally.
  
+ config PPPOL2TP
+       tristate "PPP over L2TP (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && PPP
+       help
+         Support for PPP-over-L2TP socket family. L2TP is a protocol
+         used by ISPs and enterprises to tunnel PPP traffic over UDP
+         tunnels. L2TP is replacing PPTP for VPN uses.
+ 
+         This kernel component handles only L2TP data packets: a
+         userland daemon handles L2TP the control protocol (tunnel
+         and session setup). One such daemon is OpenL2TP
+         (http://openl2tp.sourceforge.net/).
+ 
  config SLIP
        tristate "SLIP (serial line) support"
        ---help---