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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a39644b a6127b4)

author	Kalle Valo <kvalo@codeaurora.org>
	Mon, 16 Oct 2017 14:06:54 +0000 (17:06 +0300)
committer	Kalle Valo <kvalo@codeaurora.org>
	Mon, 16 Oct 2017 14:09:24 +0000 (17:09 +0300)
commit	0fac9e2dff00a2344ffc81d82749181ffae408a2
tree	1399ce5ce12955c971c4727dd70bc8b4db2754f1	tree \| snapshot
parent	a39644b235c1a45f84d6e16603cacb93740ed2d4	commit \| diff
parent	a6127b4440d1f74f26b64006b2f50c9dc6d66efc	commit \| diff

Merge git://git./linux/kernel/git/kvalo/wireless-drivers.git

Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.

15 files changed:

drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/cfg/a000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-config.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/d3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/quantenna/qtnfmac/event.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c	diff1 \|	diff2 \|	blob \| history

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