projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b08cc24 11b2357)
Merge branch 'mac80211' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 20 Oct 2014 14:41:33 +0000 (16:41 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 20 Oct 2014 19:39:29 +0000 (21:39 +0200)
This was needed to avoid conflicts in the minstrel changes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1  2 
net/mac80211/cfg.c patch | diff1 | diff2 | blob | history
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/cfg.c
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.