all trees merged
From: David Miller <davem@davemloft.net>
Date: 2011-06-21 05:30:57
Linus took in my net-2.6 fixes in time for 3.0-rc4 Therefore I fast-forwarded net-2.6 to Linus's tree's head. Then I merged net-2.6 into net-next-2.6 Note that this makes the staging drivers available in the config by default as a side effect.