Subject: net-2.6 merged into net-next-2.6

From: David Miller <[email-masked]>
Date: Mon, 16 Jun 2008 19:31:20 -0700 (PDT)

In order to address a wireless and an SCTP conflict,
I've merged net-next-2.6 into net-2.6 (again) :-)

Happy hacking.