Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Jul 2009 02:03:51 +0000 (19:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jul 2009 02:03:51 +0000 (19:03 -0700)
commit74d154189d597b91da4322996dbf4f5c3d1544ab
tree6f09861b5e2f875d2d8ea2127b16add9103221c6
parent5a6338db37885af06760d40cad589316e48431e9
parentffafa60d496f80c250f2ae0340ae94434c0b0b4d
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
32 files changed:
Documentation/connector/cn_test.c
Documentation/connector/ucon.c
MAINTAINERS
drivers/connector/cn_queue.c
drivers/connector/connector.c
drivers/net/arm/at91_ether.c
drivers/net/benet/be_main.c
drivers/net/bnx2x_link.c
drivers/net/can/sja1000/sja1000.c
drivers/net/gianfar.c
drivers/net/hamradio/6pack.c
drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_main.c
drivers/net/jazzsonic.c
drivers/net/pcmcia/3c589_cs.c
drivers/net/ucc_geth.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/regd.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/netdev.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/rt2x00/rt2500usb.c
include/linux/rfkill.h
net/ipv4/tcp_output.c
net/mac80211/Kconfig
net/mac80211/tx.c
net/rfkill/core.c
net/wireless/nl80211.c
net/wireless/scan.c