projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa44b98 1e359a5)
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)
commit3a4b0c948d286523ba062985c03487b55326eaae
tree8c61bbeb09f9d810d3132919c22e8effcc4e545ctree | snapshot
parentfa44b988d2da58334ecbcf3e00f9acccbdeace6ccommit | diff
parent1e359a5de861a57aa04d92bb620f52a5c1d7f8b1commit | 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
Unnamed repository; edit this file 'description' to name the repository.