Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
  r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
  ipv6: Don't drop cache route entry unless timer actually expired.
  tulip: Add missing parens.
  r8169: fix broken register writes
  pcnet_cs: add new id
  bonding: fix broken multicast with round-robin mode
  drivers/net: Fix continuation lines
  e1000: do not modify tx_queue_len on link speed change
  net: ipmr/ip6mr: prevent out-of-bounds vif_table access
  ixgbe: Do not run all Diagnostic offline tests when VFs are active
  igb: use correct bits to identify if managability is enabled
  benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c
  net: Add MSG_WAITFORONE flag to recvmmsg
  e1000e: do not modify tx_queue_len on link speed change
  igbvf: do not modify tx_queue_len on link speed change
  ipv4: Restart rt_intern_hash after emergency rebuild (v2)
  ipv4: Cleanup struct net dereference in rt_intern_hash
  net: fix netlink address dumping in IPv4/IPv6
  tulip: Fix null dereference in uli526x_rx_packet()
  gianfar: fix undo of reserve()
  ...

diff --combined MAINTAINERS
index 28d4bf0e483e06e732d8ead8637de622e6b61c66,9ff6341e43ba0955c01879ee444cd44a2fbcb78f..1a203f9626f64b2aee9d091e85d083e26eed91fc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -797,12 -797,12 +797,12 @@@ M:      Michael Petchkovsky <mkpetch@interno
  S:    Maintained
  
  ARM/NOMADIK ARCHITECTURE
 -M:     Alessandro Rubini <rubini@unipv.it>
 -M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
 -L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:     Maintained
 -F:     arch/arm/mach-nomadik/
 -F:     arch/arm/plat-nomadik/
 +M:    Alessandro Rubini <rubini@unipv.it>
 +M:    STEricsson <STEricsson_nomadik_linux@list.st.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-nomadik/
 +F:    arch/arm/plat-nomadik/
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
@@@ -1926,17 -1926,17 +1926,17 @@@ F:   drivers/scsi/dpt
  F:    drivers/scsi/dpt/
  
  DRBD DRIVER
 -P:     Philipp Reisner
 -P:     Lars Ellenberg
 -M:     drbd-dev@lists.linbit.com
 -L:     drbd-user@lists.linbit.com
 -W:     http://www.drbd.org
 -T:     git git://git.drbd.org/linux-2.6-drbd.git drbd
 -T:     git git://git.drbd.org/drbd-8.3.git
 -S:     Supported
 -F:     drivers/block/drbd/
 -F:     lib/lru_cache.c
 -F:     Documentation/blockdev/drbd/
 +P:    Philipp Reisner
 +P:    Lars Ellenberg
 +M:    drbd-dev@lists.linbit.com
 +L:    drbd-user@lists.linbit.com
 +W:    http://www.drbd.org
 +T:    git git://git.drbd.org/linux-2.6-drbd.git drbd
 +T:    git git://git.drbd.org/drbd-8.3.git
 +S:    Supported
 +F:    drivers/block/drbd/
 +F:    lib/lru_cache.c
 +F:    Documentation/blockdev/drbd/
  
  DRIVER CORE, KOBJECTS, AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@suse.de>
@@@ -3083,6 -3083,7 +3083,7 @@@ F:      include/scsi/*iscsi
  ISDN SUBSYSTEM
  M:    Karsten Keil <isdn@linux-pingi.de>
  L:    isdn4linux@listserv.isdn4linux.de (subscribers-only)
+ L:    netdev@vger.kernel.org
  W:    http://www.isdn4linux.de
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
  S:    Maintained
@@@ -3518,8 -3519,8 +3519,8 @@@ F:      drivers/scsi/sym53c8xx_2
  LTP (Linux Test Project)
  M:    Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
  M:    Garrett Cooper <yanegomi@gmail.com>
 -M:     Mike Frysinger <vapier@gentoo.org>
 -M:     Subrata Modak <subrata@linux.vnet.ibm.com>
 +M:    Mike Frysinger <vapier@gentoo.org>
 +M:    Subrata Modak <subrata@linux.vnet.ibm.com>
  L:    ltp-list@lists.sourceforge.net (subscribers-only)
  W:    http://ltp.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
@@@ -6200,7 -6201,7 +6201,7 @@@ F:      arch/x86
  X86 PLATFORM DRIVERS
  M:    Matthew Garrett <mjg@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
 -T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86