Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2009 00:44:53 +0000 (17:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2009 00:44:53 +0000 (17:44 -0700)
commitaa11d958d1a6572eda08214d7c6a735804fe48a5
treed025b05270ad1e010660d17eeadc6ac3c1abbd7d
parent07f6642ee9418e962e54cbc07471cfe2e559c568
parent9799218ae36910af50f002a5db1802d576fffb43
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
arch/microblaze/include/asm/socket.h
61 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/mips/ar7/platform.c
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S
drivers/misc/sgi-xp/xpnet.c
drivers/net/3c59x.c
drivers/net/a2065.c
drivers/net/bmac.c
drivers/net/bnx2x_main.c
drivers/net/epic100.c
drivers/net/fealnx.c
drivers/net/fec.c
drivers/net/gianfar.c
drivers/net/hamachi.c
drivers/net/hamradio/baycom_epp.c
drivers/net/irda/w83977af_ir.c
drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_type.h
drivers/net/mlx4/en_rx.c
drivers/net/mlx4/en_tx.c
drivers/net/natsemi.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/pci-skeleton.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcnet32.c
drivers/net/ppp_generic.c
drivers/net/sky2.c
drivers/net/starfire.c
drivers/net/sundance.c
drivers/net/tulip/de2104x.c
drivers/net/tulip/tulip_core.c
drivers/net/tulip/winbond-840.c
drivers/net/tun.c
drivers/net/wan/sbni.c
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/commands.c
drivers/net/wireless/libertas/assoc.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/wavelan_cs.c
drivers/net/yellowfin.c
drivers/staging/stlc45xx/stlc45xx.c
include/net/cfg80211.h
net/core/dev.c
net/core/net_namespace.c
net/dccp/proto.c
net/econet/af_econet.c
net/ieee802154/af_ieee802154.c
net/ieee802154/dgram.c
net/ieee802154/raw.c
net/wireless/reg.c
net/wireless/reg.h
net/wireless/scan.c