git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 52874a5 3a5a423)

author	Johannes Berg <johannes.berg@intel.com>
	Wed, 19 Jun 2013 16:55:06 +0000 (18:55 +0200)
committer	Johannes Berg <johannes.berg@intel.com>
	Wed, 19 Jun 2013 16:55:12 +0000 (18:55 +0200)
commit	f93beba705842af466e7c916b39630cacb40e9c6
tree	0f296f0b1e419eb4fc242e188376a4fdd80085fa	tree \| snapshot (tar.gz zip)
parent	52874a5e3917dde3b081521b014d6e4b226aacff	commit \| diff
parent	3a5a423bb958ad22eeccca66c533e85bf69ba10e	commit \| diff

Merge remote-tracking branch 'mac80211/master' into HEAD

Merge mac80211 to avoid conflicts with the nl80211 attrbuf
changes.

Conflicts:
net/mac80211/iface.c
net/wireless/nl80211.c

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

net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rate.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history