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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (145 commits)
  bnx2x: use pci_pcie_cap()
  bnx2x: fix bnx2x_stop_on_error flow in bnx2x_sp_rtnl_task
  bnx2x: enable internal target-read for 57712 and up only
  bnx2x: count statistic ramrods on EQ to prevent MC assert
  bnx2x: fix loopback for non 10G link
  bnx2x: dcb - send all unmapped priorities to same COS as L2
  iwlwifi: Fix build with CONFIG_PM disabled.
  gre: fix improper error handling
  ipv4: use RT_TOS after some rt_tos conversions
  via-velocity: remove duplicated #include
  qlge: remove duplicated #include
  igb: remove duplicated #include
  can: c_can: remove duplicated #include
  bnad: remove duplicated #include
  net: allow netif_carrier to be called safely from IRQ
  bna: Header File Consolidation
  bna: HW Error Counter Fix
  bna: Add HW Semaphore Unlock Logic
  bna: IOC Event Name Change
  bna: Mboxq Flush When IOC Disabled
  ...

diff --combined MAINTAINERS
index 43392c9,a116b35..39d8822
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -534,8 -534,6 +534,8 @@@ L: device-drivers-devel@blackfin.uclinu
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  S:    Supported
 +F:    sound/soc/codecs/adau*
 +F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
  F:    sound/soc/codecs/ssm*
  
@@@ -1553,12 -1551,6 +1553,12 @@@ L:    linux-wireless@vger.kernel.or
  S:    Supported
  F:    drivers/staging/brcm80211/
  
 +BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 +M:    Bhanu Prakash Gollapudi <bprakash@broadcom.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/bnx2fc/
 +
  BROCADE BFA FC SCSI DRIVER
  M:    Jing Huang <huangj@brocade.com>
  L:    linux-scsi@vger.kernel.org
@@@ -1781,8 -1773,7 +1781,8 @@@ F:      include/linux/clk.
  
  CISCO FCOE HBA DRIVER
  M:    Abhijeet Joglekar <abjoglek@cisco.com>
 -M:    Joe Eykholt <jeykholt@cisco.com>
 +M:    Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com>
 +M:    Brian Uchino <buchino@cisco.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/fnic/
@@@ -4106,6 -4097,12 +4106,12 @@@ S:    Maintaine
  F:    drivers/net/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
+ MARVELL MWIFIEX WIRELESS DRIVER
+ M:    Bing Zhao <bzhao@marvell.com>
+ L:    linux-wireless@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/wireless/mwifiex/
+ 
  MARVELL MWL8K WIRELESS DRIVER
  M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    linux-wireless@vger.kernel.org
@@@ -4688,14 -4685,6 +4694,14 @@@ F:    drivers/o
  F:    include/linux/of*.h
  K:    of_get_property
  
 +OPENRISC ARCHITECTURE
 +M:    Jonas Bonn <jonas@southpole.se>
 +W:    http://openrisc.net
 +L:    linux@lists.openrisc.net
 +S:    Maintained
 +T:    git git://openrisc.net/~jonas/linux
 +F:    arch/openrisc
 +
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -5335,13 -5324,6 +5341,13 @@@ L:    reiserfs-devel@vger.kernel.or
  S:    Supported
  F:    fs/reiserfs/
  
 +REGISTER MAP ABSTRACTION
 +M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
 +S:    Supported
 +F:    drivers/base/regmap/
 +F:    include/linux/regmap.h
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -6972,9 -6954,9 +6978,9 @@@ S:      Maintaine
  F:    drivers/input/misc/wistron_btns.c
  
  WL1251 WIRELESS DRIVER
- M:    Kalle Valo <kvalo@adurom.com>
+ M:    Luciano Coelho <coelho@ti.com>
  L:    linux-wireless@vger.kernel.org
- W:    http://wireless.kernel.org
+ W:    http://wireless.kernel.org/en/users/Drivers/wl1251
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/wl1251/*