To resolve some conflicts I merged net-2.6 into net-next-2.6 just now.

Let me know if this results in any problems, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html