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: (26 commits)
  net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2
  ixgbe: allow tx of pre-formatted vlan tagged packets
  ixgbe: Fix 82598 premature copper PHY link indicatation
  ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters
  bcm63xx_enet: fix compilation failure after get_stats_count removal
  packet: dont call sleeping functions while holding rcu_read_lock()
  tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
  ipvs: zero usvc and udest
  netfilter: fix crashes in bridge netfilter caused by fragment jumps
  ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
  sky2: leave PCI config space writeable
  sky2: print Optima chip name
  x25: Update maintainer.
  ipvs: fix synchronization on connection close
  netfilter: xtables: document minimal required version
  drivers/net/bonding/: : use pr_fmt
  can: CAN_MCP251X should depend on HAS_DMA
  drivers/net/usb: Correct code taking the size of a pointer
  drivers/net/cpmac.c: Correct code taking the size of a pointer
  drivers/net/sfc: Correct code taking the size of a pointer
  ...

diff --combined MAINTAINERS
index 0a32c3e,256139e..d6a2711
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -801,19 -801,6 +801,19 @@@ L:       openmoko-kernel@lists.openmoko.org (
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
  S:    Supported
  
 +ARM/QUALCOMM MSM MACHINE SUPPORT
 +M:    David Brown <davidb@codeaurora.org>
 +M:    Daniel Walker <dwalker@codeaurora.org>
 +M:    Bryan Huntsman <bryanh@codeaurora.org>
 +F:    arch/arm/mach-msm/
 +F:    drivers/video/msm/
 +F:    drivers/mmc/host/msm_sdcc.c
 +F:    drivers/mmc/host/msm_sdcc.h
 +F:    drivers/serial/msm_serial.h
 +F:    drivers/serial/msm_serial.c
 +T:    git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git
 +S:    Maintained
 +
  ARM/TOSA MACHINE SUPPORT
  M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    Dirk Opfer <dirk@opfer-online.de>
@@@ -835,13 -822,13 +835,13 @@@ F:      arch/arm/mach-pxa/palmte2.
  F:    arch/arm/mach-pxa/include/mach/palmtc.h
  F:    arch/arm/mach-pxa/palmtc.c
  
 -ARM/PALM TREO 680 SUPPORT
 +ARM/PALM TREO SUPPORT
  M:    Tomas Cech <sleep_walker@suse.cz>
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/treo680.h
 -F:    arch/arm/mach-pxa/treo680.c
 +F:    arch/arm/mach-pxa/include/mach/palmtreo.h
 +F:    arch/arm/mach-pxa/palmtreo.c
  
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <slapin@ossfans.org>
@@@ -1482,8 -1469,8 +1482,8 @@@ F:      include/linux/coda*.
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <sfrench@samba.org>
 -L:    linux-cifs-client@lists.samba.org
 -L:    samba-technical@lists.samba.org
 +L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
 +L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
@@@ -3081,11 -3068,8 +3081,11 @@@ S:    Maintaine
  F:    fs/autofs4/
  
  KERNEL BUILD
 +M:    Michal Marek <mmarek@suse.cz>
 +T:    git git://repo.or.cz/linux-kbuild.git for-next
 +T:    git git://repo.or.cz/linux-kbuild.git for-linus
  L:    linux-kbuild@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/kbuild/
  F:    Makefile
  F:    scripts/Makefile.*
@@@ -3127,6 -3111,7 +3127,6 @@@ L:      kvm@vger.kernel.or
  W:    http://kvm.qumranet.com
  S:    Supported
  F:    arch/x86/include/asm/svm.h
 -F:    arch/x86/kvm/kvm_svm.h
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
@@@ -3262,7 -3247,6 +3262,7 @@@ LINUX FOR IBM pSERIES (RS/6000
  M:    Paul Mackerras <paulus@au.ibm.com>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
  S:    Supported
 +F:    arch/powerpc/boot/rs6000.h
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@@ -3271,24 -3255,18 +3271,24 @@@ W:   http://www.penguinppc.org
  L:    linuxppc-dev@ozlabs.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
 +F:    Documentation/powerpc/
 +F:    arch/powerpc/
  
  LINUX FOR POWER MACINTOSH
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
  S:    Maintained
 +F:    arch/powerpc/platforms/powermac/
 +F:    drivers/macintosh/
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    linuxppc-dev@ozlabs.org
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 +F:    arch/powerpc/platforms/512x/
 +F:    arch/powerpc/platforms/52xx/
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
  M:    Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@@ -3297,8 -3275,6 +3297,8 @@@ W:      http://www.penguinppc.org
  L:    linuxppc-dev@ozlabs.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
 +F:    arch/powerpc/platforms/40x/
 +F:    arch/powerpc/platforms/44x/
  
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
  M:    Grant Likely <grant.likely@secretlab.ca>
@@@ -3306,8 -3282,6 +3306,8 @@@ W:      http://wiki.secretlab.ca/index.php/L
  L:    linuxppc-dev@ozlabs.org
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 +F:    arch/powerpc/*/*virtex*
 +F:    arch/powerpc/*/*/*virtex*
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
  M:    Vitaly Bordug <vitb@kernel.crashing.org>
@@@ -3321,16 -3295,12 +3321,16 @@@ M:   Kumar Gala <galak@kernel.crashing.or
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
  S:    Maintained
 +F:    arch/powerpc/platforms/83xx/
  
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  M:    Olof Johansson <olof@lixom.net>
  W:    http://www.pasemi.com/
  L:    linuxppc-dev@ozlabs.org
  S:    Supported
 +F:    arch/powerpc/platforms/pasemi/
 +F:    drivers/*/*pasemi*
 +F:    drivers/*/*/*pasemi*
  
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <chrisw@sous-sol.org>
@@@ -5082,7 -5052,6 +5082,7 @@@ F:      drivers/char/specialix
  
  SPI SUBSYSTEM
  M:    David Brownell <dbrownell@users.sourceforge.net>
 +M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
  S:    Maintained
  F:    Documentation/spi/
@@@ -5976,7 -5945,6 +5976,7 @@@ M:      Mark Brown <broonie@opensource.wolfs
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
  W:    http://opensource.wolfsonmicro.com/node/8
  S:    Supported
 +F:    Documentation/hwmon/wm83??
  F:    drivers/leds/leds-wm83*.c
  F:    drivers/mfd/wm8*.c
  F:    drivers/power/wm83*.c
@@@ -5986,14 -5954,14 +5986,14 @@@ F:   drivers/video/backlight/wm83*_bl.
  F:    drivers/watchdog/wm83*_wdt.c
  F:    include/linux/mfd/wm831x/
  F:    include/linux/mfd/wm8350/
 -F:    include/linux/mfd/wm8400/
 -F:    sound/soc/codecs/wm8350.c
 -F:    sound/soc/codecs/wm8400.c
 +F:    include/linux/mfd/wm8400*
 +F:    sound/soc/codecs/wm8350.*
 +F:    sound/soc/codecs/wm8400.*
  
  X.25 NETWORK LAYER
- M:    Henner Eisen <eis@baty.hanse.de>
+ M:    Andrew Hendry <andrew.hendry@gmail.com>
  L:    linux-x25@vger.kernel.org
- S:    Maintained
+ S:    Odd Fixes
  F:    Documentation/networking/x25*
  F:    include/net/x25*
  F:    net/x25/