xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f730f9158f6ee7b5c4d892af6b51a72194445ea4
android_kernel_xiaomi_sm8450/net/mac80211/iface.c
Johannes Berg f93beba705 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>
2013-06-19 18:55:12 +02:00

46 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink