Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Apr 2012 19:03:48 +0000 (15:03 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Apr 2012 19:03:48 +0000 (15:03 -0400)
commitd9b8ae6bd8c3304569a25079fcdbebaa28a48ee4
tree9ce3e4eb355685f970dd7333a0a935109aff0583
parent872f24dbc604ef585ea7eec73020dcdfaffd1956
parent94c514fe240fc0dd02187b78facefde8b6744634
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/mac80211/rx.c
net/wireless/nl80211.c