net-2.6 merged into net-next-2.6
From: David Miller <davem@davemloft.net>
Date: 2008-07-06 06:21:05
To solve some wireless merge hassles and be able to apply some packet scheduler patches to net-next-2.6 from Patrick McHardy (they depend upon net-2.6 fixes), I just merged net-next-2.6 into net-2.6 Let me know if I screwed anything up.