]> git.proxmox.com Git - mirror_ubuntu-eoan-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, 7 Jun 2010 19:13:46 +0000 (15:13 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Jun 2010 19:13:46 +0000 (15:13 -0400)
commit9d88477c41904127ab9ae1f3b5b4a39bf6474043
treef50d5185ac89a9fd76d7cb087b952d5c55d5063b
parent11b7c60988e5fbabb4e150612931cc068559af16
parent35dd0509b21e4b5bab36b9eb80c8dab0322f5007
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
13 files changed:
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/p54/p54usb.c
net/mac80211/agg-tx.c
net/mac80211/driver-ops.h
net/mac80211/mlme.c
net/mac80211/rx.c