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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
  ipv6: check for IPv4 mapped addresses when connecting IPv6 sockets
  mlx4: decreasing ref count when removing mac
  net: Fix security_socket_sendmsg() bypass problem.
  net: Cap number of elements for sendmmsg
  net: sendmmsg should only return an error if no messages were sent
  ixgbe: fix PHY link setup for 82599
  ixgbe: fix __ixgbe_notify_dca() bail out code
  igb: fix WOL on second port of i350 device
  e1000e: minor re-order of #include files
  e1000e: remove unnecessary check for NULL pointer
  intel drivers: repair missing flush operations
  macb: restore wrap bit when performing underrun cleanup
  cdc_ncm: fix endianness problem.
  irda: use PCI_VENDOR_ID_*
  mlx4: Fixing Ethernet unicast packet steering
  net: fix NULL dereferences in check_peer_redir()
  bnx2x: Clear MDIO access warning during first driver load
  bnx2x: Fix BCM578xx MAC test
  bnx2x: Fix BCM54618se invalid link indication
  bnx2x: Fix BCM84833 link
  ...

diff --combined MAINTAINERS
index 07cfd8deaad5d5da2b57cddff8e6513158bbcd02,ca87f470e5481051f3bd7f1076175379a715f5ef..51d42fbc8dc40a9f09da5471085a928c244e62ed
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1925,12 -1925,6 +1925,12 @@@ S:    Maintaine
  F:    arch/x86/kernel/cpuid.c
  F:    arch/x86/kernel/msr.c
  
 +CPU POWER MONITORING SUBSYSTEM
 +M:    Dominik Brodowski <[email protected]>
 +M:    Thomas Renninger <[email protected]>
 +S:    Maintained
 +F:    tools/power/cpupower
 +
  CPUSETS
  M:    Paul Menage <[email protected]>
  W:    http://www.bullopensource.org/cpuset/
@@@ -2643,9 -2637,8 +2643,8 @@@ S:      Maintaine
  F:    arch/x86/math-emu/
  
  FRAME RELAY DLCI/FRAD (Sangoma drivers too)
- M:    Mike McLagan <[email protected]>
  L:    [email protected]
- S:    Maintained
+ S:    Orphan
  F:    drivers/net/wan/dlci.c
  F:    drivers/net/wan/sdla.c
  
@@@ -3367,12 -3360,6 +3366,12 @@@ F:    drivers/net/ixgb
  F:    drivers/net/ixgbe/
  F:    drivers/net/ixgbevf/
  
 +INTEL MRST PMU DRIVER
 +M:    Len Brown <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/platform/mrst/pmu.*
 +
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
  L:    [email protected]
  S:    Orphan
@@@ -4162,13 -4149,6 +4161,13 @@@ S:    Orpha
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
  
 +MAX1668 TEMPERATURE SENSOR DRIVER
 +M:    "David George" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/max1668
 +F:    drivers/hwmon/max1668.c
 +
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <[email protected]>
  L:    [email protected]
@@@ -4415,10 -4395,10 +4414,10 @@@ F:   net/*/netfilter
  F:    net/netfilter/
  
  NETLABEL
- M:    Paul Moore <paul.moore@hp.com>
+ M:    Paul Moore <paul@paul-moore.com>
  W:    http://netlabel.sf.net
  L:    [email protected]
- S:    Supported
+ S:    Maintained
  F:    Documentation/netlabel/
  F:    include/net/netlabel.h
  F:    net/netlabel/
@@@ -4463,7 -4443,6 +4462,6 @@@ F:      include/linux/netdevice.
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
  M:    Alexey Kuznetsov <[email protected]>
- M:    "Pekka Savola (ipv6)" <[email protected]>
  M:    James Morris <[email protected]>
  M:    Hideaki YOSHIFUJI <[email protected]>
  M:    Patrick McHardy <[email protected]>
@@@ -4476,7 -4455,7 +4474,7 @@@ F:      include/net/ip
  F:    arch/x86/net/*
  
  NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
- M:    Paul Moore <paul.moore@hp.com>
+ M:    Paul Moore <paul@paul-moore.com>
  L:    [email protected]
  S:    Maintained
  
@@@ -4728,7 -4707,6 +4726,7 @@@ S:      Maintaine
  F:    drivers/of
  F:    include/linux/of*.h
  K:    of_get_property
 +K:    of_match_table
  
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
@@@ -5019,17 -4997,6 +5017,17 @@@ F:    drivers/i2c/busses/i2c-puv3.
  F:    drivers/video/fb-puv3.c
  F:    drivers/rtc/rtc-puv3.c
  
 +PMBUS HARDWARE MONITORING DRIVERS
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +W:    http://www.lm-sensors.org/
 +W:    http://www.roeck-us.net/linux/drivers/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 +S:    Maintained
 +F:    Documentation/hwmon/pmbus
 +F:    drivers/hwmon/pmbus/
 +F:    include/linux/i2c/pmbus.h
 +
  PMC SIERRA MaxRAID DRIVER
  M:    Anil Ravindranath <[email protected]>
  L:    [email protected]
@@@ -6325,7 -6292,6 +6323,7 @@@ F:      include/linux/sysv_fs.
  TARGET SUBSYSTEM
  M:    Nicholas A. Bellinger <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master