Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 May 2008 08:19:43 +0000 (01:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 May 2008 08:19:43 +0000 (01:19 -0700)
commit99dd1a2b8347ac2ae802300b7862f6f7bcf17139
tree4f583715a29ac95723b85532f47c3c568a544f1d
parent7ef43ebaa538e0cc9063cbf84593a05091bcace2
parent7d2e3cb7000b883a8e489485ac249be572fe17b1
Merge branch 'upstream-next' of /linux/kernel/git/jgarzik/netdev-2.6