| commit | 1e1430d5282bc3a572465ef3261eea793d98a653 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Tue Oct 04 09:22:19 2016 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Tue Oct 04 09:46:44 2016 +0200 |
| tree | 81c8883606ed2dd821f4509581888505d48631dd | |
| parent | bb42f2d13ffcd0baed7547b37d05add51fcd50e1 [diff] | |
| parent | 9a8dd213d2a38349e5ea2ca8888400952112b45c [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>