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: (21 commits)
  dca: disable dca on IOAT ver.3.0 multiple-IOH platforms
  netpoll: Disable IRQ around RCU dereference in netpoll_rx
  sctp: Do not reset the packet during sctp_packet_config().
  net/llc: storing negative error codes in unsigned short
  MAINTAINERS: move atlx discussions to netdev
  drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory
  drivers/net/eql.c: prevent reading uninitialized stack memory
  drivers/net/usb/hso.c: prevent reading uninitialized memory
  xfrm: dont assume rcu_read_lock in xfrm_output_one()
  r8169: Handle rxfifo errors on 8168 chips
  3c59x: Remove atomic context inside vortex_{set|get}_wol
  tcp: Prevent overzealous packetization by SWS logic.
  net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS
  phylib: fix PAL state machine restart on resume
  net: use rcu_barrier() in rollback_registered_many
  bonding: correctly process non-linear skbs
  ipv4: enable getsockopt() for IP_NODEFRAG
  ipv4: force_igmp_version ignored when a IGMPv3 query received
  ppp: potential NULL dereference in ppp_mp_explode()
  net/llc: make opt unsigned in llc_ui_setsockopt()
  ...

diff --combined MAINTAINERS
index 8540dea232afea0e26cf4afbac8cb9a441733997,44e659530910468ac4000ad8c0bb4cc0b75f3fd6..411b0d04f69bbb6e288ca2d6ffe8cc499aef9a78
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1135,7 -1135,7 +1135,7 @@@ ATLX ETHERNET DRIVER
  M:    Jay Cliburn <jcliburn@gmail.com>
  M:    Chris Snook <chris.snook@gmail.com>
  M:    Jie Yang <jie.yang@atheros.com>
- L:    atl1-devel@lists.sourceforge.net
+ L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/atl1
  W:    http://atl1.sourceforge.net
  S:    Maintained
@@@ -2657,12 -2657,9 +2657,12 @@@ S:    Maintaine
  F:    drivers/media/video/gspca/
  
  HARDWARE MONITORING
 +M:    Jean Delvare <khali@linux-fr.org>
 +M:    Guenter Roeck <guenter.roeck@ericsson.com>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
 -S:    Orphan
 +T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
 +S:    Maintained
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
  F:    include/linux/hwmon*.h
@@@ -2800,6 -2797,11 +2800,6 @@@ S:     Maintaine
  F:    arch/x86/kernel/hpet.c
  F:    arch/x86/include/asm/hpet.h
  
 -HPET: ACPI
 -M:    Bob Picco <bob.picco@hp.com>
 -S:    Maintained
 -F:    drivers/char/hpet.c
 -
  HPFS FILESYSTEM
  M:    Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
  W:    http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
@@@ -3412,7 -3414,7 +3412,7 @@@ F:      drivers/s390/kvm
  
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
 -W:    http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 +W:    http://kernel.org/pub/linux/utils/kernel/kexec/
  L:    kexec@lists.infradead.org
  S:    Maintained
  F:    include/linux/kexec.h
@@@ -4818,7 -4820,6 +4818,7 @@@ RCUTORTURE MODUL
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  S:    Supported
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -4843,7 -4844,6 +4843,7 @@@ M:      Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    include/linux/srcu*
@@@ -4851,10 -4851,12 +4851,10 @@@ F:   kernel/rcu
  F:    kernel/srcu*
  X:    kernel/rcutorture.c
  
 -REAL TIME CLOCK DRIVER
 +REAL TIME CLOCK DRIVER (LEGACY)
  M:    Paul Gortmaker <p_gortmaker@yahoo.com>
  S:    Maintained
 -F:    Documentation/rtc.txt
 -F:    drivers/rtc/
 -F:    include/linux/rtc.h
 +F:    drivers/char/rtc.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>