tree 81c8883606ed2dd821f4509581888505d48631dd
parent bb42f2d13ffcd0baed7547b37d05add51fcd50e1
parent 9a8dd213d2a38349e5ea2ca8888400952112b45c
author Johannes Berg <johannes.berg@intel.com> 1475565739 +0200
committer Johannes Berg <johannes.berg@intel.com> 1475567204 +0200

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>