Merge branch 'master' of ../linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sun, 24 Feb 2008 04:38:20 +0000 (20:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 Feb 2008 04:38:20 +0000 (20:38 -0800)
commit8d3c202be23c5a915f7053ebd4e96f44700c6a62
treee0f017aff86d3ad0b858fe85f44e11096087ed00
parent1b04ab4597725f75f94942da9aa40daa7b9a4bd9
parent038eb0ea04b245351be34b0ae76b55eee4603989
Merge branch 'master' of ../linux-2.6/
net/core/dev.c