merge net into net-next?

Hi Dave,

Could you do me a favour and merge net into net-next? I want to merge
that back in order to apply a patch to mac80211-next that otherwise
conflicts fairly badly with a change in mac80211.

Thanks!

johannes