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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (42 commits)
  netpoll: fix incorrect access to skb data in __netpoll_rx
  cassini: init before use in cas_interruptN.
  can: ti_hecc: Fix uninitialized spinlock in probe
  can: ti_hecc: Fix unintialized variable
  net: sh_eth: fix the compile error
  net/phy: fix DP83865 phy interrupt handler
  sendmmsg/sendmsg: fix unsafe user pointer access
  ibmveth: Fix leak when recycling skb and hypervisor returns error
  arp: fix rcu lockdep splat in arp_process()
  bridge: fix a possible use after free
  bridge: Pseudo-header required for the checksum of ICMPv6
  mcast: Fix source address selection for multicast listener report
  MAINTAINERS: Update GIT trees for network development
  ath9k: Fix PS wrappers in ath9k_set_coverage_class
  carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock
  wl12xx: add max_sched_scan_ssids value to the hw description
  wl12xx: Fix validation of pm_runtime_get_sync return value
  wl12xx: Remove obsolete testmode NVS push command
  bcma: add uevent to the bus, to autoload drivers
  ath9k_hw: Fix STA (AR9485) bringup issue due to incorrect MAC address
  ...

diff --combined MAINTAINERS
index d513433d1659c38e441c772b34f3f17811decdd8,c94a898caca94cdcb155b52a22acb994adf44a66..28f65c249b97b396e976ec2fd85946dce6e48023
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1883,7 -1883,7 +1883,7 @@@ S:      Maintaine
  F:    drivers/connector/
  
  CONTROL GROUPS (CGROUPS)
 -M:    Paul Menage <menage@google.com>
 +M:    Paul Menage <paul@paulmenage.org>
  M:    Li Zefan <lizf@cn.fujitsu.com>
  L:    containers@lists.linux-foundation.org
  S:    Maintained
@@@ -1932,7 -1932,7 +1932,7 @@@ S:      Maintaine
  F:    tools/power/cpupower
  
  CPUSETS
 -M:    Paul Menage <menage@google.com>
 +M:    Paul Menage <paul@paulmenage.org>
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
  S:    Supported
@@@ -2649,11 -2649,11 +2649,11 @@@ F:   drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Paul Mundt <lethal@linux-sh.org>
 +M:    Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  L:    linux-fbdev@vger.kernel.org
  W:    http://linux-fbdev.sourceforge.net/
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
 +T:    git git://github.com/schandinat/linux-2.6.git fbdev-next
  S:    Maintained
  F:    Documentation/fb/
  F:    Documentation/devicetree/bindings/fb/
@@@ -4450,8 -4450,8 +4450,8 @@@ M:      "David S. Miller" <davem@davemloft.n
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
  W:    http://patchwork.ozlabs.org/project/netdev/list/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
  S:    Maintained
  F:    net/
  F:    include/net/
@@@ -5532,7 -5532,6 +5532,7 @@@ F:      include/media/*7146
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Jassi Brar <jassisinghbrar@gmail.com>
 +M:    Sangbeom Kim <sbkim73@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung
@@@ -7088,7 -7087,7 +7088,7 @@@ S:      Supporte
  F:    drivers/mmc/host/vub300.c
  
  W1 DALLAS'S 1-WIRE BUS
 -M:    Evgeniy Polyakov <johnpol@2ka.mipt.ru>
 +M:    Evgeniy Polyakov <zbr@ioremap.net>
  S:    Maintained
  F:    Documentation/w1/
  F:    drivers/w1/