review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

projects / platform / kernel / linux-amlogic.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	51217cee3a94d5409d6ee2ac090ae96bc9a06757
tree	373c5ebf9e87ef81feb1d02feaf06f673fcf9a13	tree \| snapshot
parent	ff40b425f04144771920b79672d6691910c7def7	commit \| diff
parent	99e94940697adec4f84758adb2db71f4a82c7ba5	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>

Domain: System / Kernel;

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