projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb42f2d 9a8dd21)
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 4 Oct 2016 07:22:19 +0000 (09:22 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 4 Oct 2016 07:46:44 +0000 (09:46 +0200)
commit1e1430d5282bc3a572465ef3261eea793d98a653
tree81c8883606ed2dd821f4509581888505d48631ddtree | snapshot (tar.gz zip)
parentbb42f2d13ffcd0baed7547b37d05add51fcd50e1commit | diff
parent9a8dd213d2a38349e5ea2ca8888400952112b45ccommit | diff
Merge remote-tracking branch 'net-next/master' into mac80211-next

Resolve the merge conflict between Felix's/my and Toke's patches
coming into the tree through net and mac80211-next respectively.
Most of Felix's changes go away due to Toke's new infrastructure
work, my patch changes to "goto begin" (the label wasn't there
before) instead of returning NULL so flow control towards drivers
is preserved better.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mac80211/sta_info.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
Motorola kernel-slsi