net-2.6 and net-next-2.6 rebased...
From: David Miller <davem@davemloft.net>
Date: 2009-09-14 23:55:50
Now that Linus has pulled net-next-2.6 into his tree, I have rebased both net-2.6 and net-next-2.6 so that they are fresh and clean. As a reminder, bug fixes only at this point, thanks.