projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52874a5 3a5a423)
Merge remote-tracking branch 'mac80211/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Wed, 19 Jun 2013 16:55:06 +0000 (18:55 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 19 Jun 2013 16:55:12 +0000 (18:55 +0200)
commitf93beba705842af466e7c916b39630cacb40e9c6
tree0f296f0b1e419eb4fc242e188376a4fdd80085fatree | snapshot
parent52874a5e3917dde3b081521b014d6e4b226aacffcommit | diff
parent3a5a423bb958ad22eeccca66c533e85bf69ba10ecommit | 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
Unnamed repository; edit this file 'description' to name the repository.