tree 4f583715a29ac95723b85532f47c3c568a544f1d
parent 7ef43ebaa538e0cc9063cbf84593a05091bcace2
parent 7d2e3cb7000b883a8e489485ac249be572fe17b1
author David S. Miller <davem@davemloft.net> 1210666783 -0700
committer David S. Miller <davem@davemloft.net> 1210666783 -0700

Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6