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 --cc 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
@@@ -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 --cc MAINTAINERS
Simple merge

diff --cc drivers/net/Kconfig
Simple merge