Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
index df55d24,aee67a8..22af496
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4984,15 -4291,12 +4291,12 @@@ L:   linux-wireless@vger.kernel.or
  W:    http://linuxwireless.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
 -F:    drivers/net/wireless/rtl818*
 +F:    drivers/net/wireless/rtl818x/rtl8180*
  
  RTL8187 WIRELESS DRIVER
- P:    Herton Ronaldo Krzesinski
- M:    herton@mandriva.com.br
- P:    Hin-Tak Leung
- M:    htl10@users.sourceforge.net
- P:    Larry Finger
- M:    Larry.Finger@lwfinger.net
+ M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ M:    Hin-Tak Leung <htl10@users.sourceforge.net>
+ M:    Larry Finger <Larry.Finger@lwfinger.net>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
@@@ -6466,18 -5570,8 +5570,17 @@@ M:    Miloslav Trmac <mitr@volny.cz
  S:    Maintained
  F:    drivers/input/misc/wistron_btns.c
  
 +WL1251 WIRELESS DRIVER
 +P:    Kalle Valo
 +M:    kalle.valo@nokia.com
 +L:    linux-wireless@vger.kernel.org
 +W:    http://wireless.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:    Maintained
 +F:    drivers/net/wireless/wl12xx/wl1251*
 +
  WL3501 WIRELESS PCMCIA CARD DRIVER
- P:    Arnaldo Carvalho de Melo
- M:    acme@ghostprotocols.net
+ M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  L:    linux-wireless@vger.kernel.org
  W:    http://oops.ghostprotocols.net:81/blog
  S:    Maintained

diff --cc arch/mips/ar7/platform.c
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/mips/kernel/scall64-o32.S
Simple merge

diff --cc drivers/misc/sgi-xp/xpnet.c
Simple merge

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/a2065.c
Simple merge

diff --cc drivers/net/bmac.c
Simple merge

diff --cc drivers/net/bnx2x_main.c
Simple merge

diff --cc drivers/net/epic100.c
Simple merge

diff --cc drivers/net/fealnx.c
Simple merge

diff --cc drivers/net/fec.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/hamachi.c
Simple merge

diff --cc drivers/net/hamradio/baycom_epp.c
Simple merge

diff --cc drivers/net/irda/w83977af_ir.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe.h
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_82598.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_type.h
Simple merge

diff --cc drivers/net/mlx4/en_rx.c
Simple merge

diff --cc drivers/net/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/natsemi.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_main.c
index c91e022,70c05c4..98271f9
--- 1/drivers/net/netxen/netxen_nic_main.c
--- 2/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@@ -281,18 -288,19 +289,23 @@@ nx_update_dma_mask(struct netxen_adapte
        }
  
        return 0;
+ 
+ err_out:
+       pci_set_dma_mask(pdev, old_mask);
+       pci_set_consistent_dma_mask(pdev, old_cmask);
+       return err;
  }
  
 -static void netxen_check_options(struct netxen_adapter *adapter)
 +static void
 +netxen_check_options(struct netxen_adapter *adapter)
  {
 -      if (adapter->ahw.port_type == NETXEN_NIC_XGBE)
 -              adapter->num_rxd = MAX_RCV_DESCRIPTORS_10G;
 -      else if (adapter->ahw.port_type == NETXEN_NIC_GBE)
 -              adapter->num_rxd = MAX_RCV_DESCRIPTORS_1G;
 +      if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
 +              adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G;
 +              adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;
 +      } else if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
 +              adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_1G;
 +              adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_1G;
 +      }
  
        adapter->msix_supported = 0;
        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {

diff --cc drivers/net/pci-skeleton.c
Simple merge

diff --cc drivers/net/pcmcia/nmclan_cs.c
Simple merge

diff --cc drivers/net/pcnet32.c
Simple merge

diff --cc drivers/net/ppp_generic.c
Simple merge

diff --cc drivers/net/sky2.c
Simple merge

diff --cc drivers/net/starfire.c
Simple merge

diff --cc drivers/net/sundance.c
Simple merge

diff --cc drivers/net/tulip/de2104x.c
Simple merge

diff --cc drivers/net/tulip/tulip_core.c
Simple merge

diff --cc drivers/net/tulip/winbond-840.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/wan/sbni.c
Simple merge

diff --cc drivers/net/wireless/ath/ar9170/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ar9170/usb.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-debugfs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/commands.c
Simple merge

diff --cc drivers/net/wireless/libertas/assoc.c
Simple merge

diff --cc drivers/net/wireless/mwl8k.c
Simple merge

diff --cc drivers/net/wireless/ray_cs.c
Simple merge

diff --cc drivers/net/wireless/wavelan_cs.c
Simple merge

diff --cc drivers/net/yellowfin.c
Simple merge

diff --cc drivers/staging/stlc45xx/stlc45xx.c
Simple merge

diff --cc include/net/cfg80211.h
index fa72997,d1892d6..64df51d
--- 1/include/net/cfg80211.h
--- 2/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@@ -1104,9 -1008,8 +1108,10 @@@ struct wiphy 
  
        bool custom_regulatory;
        bool strict_regulatory;
+       bool disable_beacon_hints;
  
 +      bool netnsok;
 +
        enum cfg80211_signal_type signal_type;
  
        int bss_priv_size;

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/net_namespace.c
Simple merge

diff --cc net/dccp/proto.c
Simple merge

diff --cc net/econet/af_econet.c
Simple merge

diff --cc net/ieee802154/af_ieee802154.c
Simple merge

diff --cc net/ieee802154/dgram.c
Simple merge

diff --cc net/ieee802154/raw.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/wireless/reg.h
Simple merge

diff --cc net/wireless/scan.c
Simple merge