Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 May 2011 17:32:35 +0000 (13:32 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 May 2011 17:32:35 +0000 (13:32 -0400)
commita70171dce9cd44cb06c7d299eba9fa87a8933045
tree5425df5f33fadc617c7dec99578d06f0d933578e
parent5a412ad7f4c95bb5b756aa12b52646e857e7c75d
parenteaef6a93bd52a2cc47b9fce201310010707afdb4
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/rtlwifi/pci.c
net/bluetooth/l2cap_sock.c
28 files changed:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/carl9170/carl9170.h
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/libertas/if_spi.h
drivers/net/wireless/p54/main.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00config.c
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/rt2x00/rt2x00usb.h
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/regd.c
drivers/net/wireless/rtlwifi/wifi.h
drivers/net/wireless/wl12xx/cmd.c
drivers/net/wireless/wl12xx/conf.h
drivers/net/wireless/wl12xx/io.h
include/net/bluetooth/hci.h
include/net/mac80211.h
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/mac80211/ieee80211_i.h
net/mac80211/rx.c
net/mac80211/sta_info.c
net/wireless/reg.c