]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2962ea6 06661c8)
Merge branch 'mac80211' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 7 Jan 2015 13:39:02 +0000 (14:39 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 7 Jan 2015 13:39:16 +0000 (14:39 +0100)
commitd2853bb5ddf4fb4daa00e32e82fd7a20d57f72c1
tree8c61bbeb09f9d810d3132919c22e8effcc4e545ctree | snapshot
parent2962ea6f90cce5505c4857ab7ea568f469399133commit | diff
parent06661c8f36606c088e7c0fc4ff55f50380a0bc73commit | diff
Merge branch 'mac80211' into mac80211-next

Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/mac80211.h diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.