Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Sep 2010 19:52:34 +0000 (15:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Sep 2010 19:52:34 +0000 (15:52 -0400)
commit29ad2facd47f8e37eab8b156e2c384fa181c8b4a
tree25d4df186cd631810ff15a8e7d37cb6cdd806cdb
parent6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b
parentcd87a2d3a33d75a646f1aa1aa2ee5bf712d6f963
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/p54/txrx.c
net/mac80211/main.c
net/mac80211/rx.c
net/wireless/core.c
net/wireless/wext-core.c