git.maquefel.me Git - linux.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Tue, 4 Mar 2014 18:05:12 +0000 (13:05 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 4 Mar 2014 18:05:12 +0000 (13:05 -0500)
commit	f3b6a488a670f1be2666ab97e31dcfc0b1648884
tree	d8d2431f21d4371c907dec075926e86840e86d1e	tree \| snapshot
parent	c14c5d99a453af6b86f15aca8fe9005b2b8f3b26	commit \| diff
parent	adb07df1e039e9fe43e66aeea8b4771f83659dbb	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/pcie.c

22 files changed:

drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-modparams.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/wmm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-modparams.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/wmm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history