[GIT] net merged into net-next

John please double check my work as the only merge hassles
were wireless bits.  I'm pretty sure I resolved things in
a reasonable way.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html