]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcd618e 6224e01)
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:56:17 +0000 (15:56 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:56:17 +0000 (15:56 -0400)
1  2 
drivers/net/e1000/e1000_main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/e1000/e1000_main.c
Simple merge
Linux 2.6 source tree