Merge branch 'lro'
authorJeff Garzik <jeff@garzik.org>
Thu, 2 Mar 2006 19:26:30 +0000 (14:26 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 2 Mar 2006 19:26:30 +0000 (14:26 -0500)
commit2ade43618b0aee83a50b344171d33d85c73d01b1
tree0a49fe46159a6ef66098a4f37935412f4f226f4c
parent75e47b36004d136edff68295420424cba3a5ccd0
parent79dc190147f8a87718fe72928d5ceb58e09acdb9
Merge branch 'lro'
drivers/net/s2io.c
drivers/net/s2io.h