]> 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>
Mon, 8 Feb 2010 21:38:38 +0000 (16:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Feb 2010 21:38:38 +0000 (16:38 -0500)
commit9ebff10eee34e9ef5ad049b2eba0839b5cbb557a
tree3e13859aae5ac0a50eecd452e96849e5e373f444
parentb09cf9762eb0b60b0861791d7cbd3fcb2f5dd675
parent70e5c54f594bb2304d535cb3af35d03006a63f8a
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
net/mac80211/scan.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
net/mac80211/driver-trace.h
net/mac80211/ibss.c
net/mac80211/scan.c