]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
projects / ~shefty / rdma-dev.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 749dfc7 cb76432)
Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6
authorJeff Garzik <jeff@garzik.org>
Sat, 11 Mar 2006 18:35:49 +0000 (13:35 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 11 Mar 2006 18:35:49 +0000 (13:35 -0500)
1  2 
drivers/net/e1000/e1000_main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/e1000/e1000_main.c
Simple merge
RDMA kernel development