]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc73fab645a0071105efa16b9d5b3ff13f3478e73
tree9ce3e4eb355685f970dd7333a0a935109aff0583
parent3159abceb2fc3611255df926fe5461af9b02bfa0
parent7c4fd22f235c125f3d36e87353ec14950d0d2fee
Merge branch 'master' of git://git.kernel.org/pub/scm/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