]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000 (10:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000 (10:28 -0400)
commit0874073570d9184a169a4ae2abbe8dbcb71878e9
tree81af47abc50641f911e3b5833850357a48a82be8
parentcd32984f64cb4fdd84e33f30da1f10582fc43cbf
parentba54238552625aad2d75f455a4d3db18ea7dec68
Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/iwlegacy/iwl3945-base.c
drivers/net/wireless/iwlegacy/iwl4965-base.c
net/wireless/nl80211.c