git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Johannes Berg <johannes.berg@intel.com>
	Tue, 4 Jun 2013 10:56:01 +0000 (12:56 +0200)
committer	Johannes Berg <johannes.berg@intel.com>
	Tue, 4 Jun 2013 11:02:42 +0000 (13:02 +0200)
commit	f96d964289324cbfe210dc4ba1b2118bb437e4d6
tree	373c5ebf9e87ef81feb1d02feaf06f673fcf9a13	tree \| snapshot
parent	eebba3fb99838549153c3c842c9fa35260ea9980	commit \| diff
parent	c4235673cd7e02450c99bb920593206eb645d046	commit \| diff

Merge remote-tracking branch 'wireless-next/master' into HEAD

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Linux Kernel Source Tree.

RSS Atom

drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/cw1200/main.c	\|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	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/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history