[MERGE] net into net-next

I just merged net into net-next.

Most of the conflicts were trivial, except perhaps the iwlwifi one
which is dealing with a revert that happened on the 'net' side.

John please double-check my work.  It's ironic that this happened
because you did a wireless mainline merge the last time you asked me
to pull into net-next exactly to avoid conflicts in this piece of code
:-)

Thanks.