Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Aug 2011 18:28:50 +0000 (14:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Aug 2011 18:28:50 +0000 (14:28 -0400)
commitb38d355eaa223e420d0c45ff7a3279ea811552c5
tree4a6b3341e1b8b72afdc19e3b9bfe8c40219c04aa
parentca1ba7caa68520864e4b9227e67f3bbc6fed373b
parentaf2bf4b4ee58d262a9a5c1d4ce6f81835058f8b5
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/mesh.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/cfg.c
net/mac80211/sta_info.c