Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Dec 2011 19:35:41 +0000 (14:35 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Dec 2011 19:35:41 +0000 (14:35 -0500)
commit5d22df200beccb1dea26fe4d8684ed93ae2f0aeb
tree05220b08a0c9d170ad88e3b9ed0390750d22d8ea
parent8b1fdb53075bd794a209a611bc94aedaf7ecf9e2
parent78feb35b8161acd95c33a703ed6ab6f554d29387
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-mac80211.c
drivers/ssb/driver_pcicore.c
net/mac80211/agg-tx.c
net/nfc/nci/core.c