]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c69a913 f268c2d)
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)
commit2d941e76841b34b23663f3e9b645afa203783977
tree0f296f0b1e419eb4fc242e188376a4fdd80085fatree | snapshot
parentc69a91359ca5e39484416019db089f23bf0c688ccommit | diff
parentf268c2de08406dde4ca5f42cb77fe8941426a0f0commit | 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
Linux Kernel Source Tree.