projects / kernel / kernel-generic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba9b28d cb15f81)
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000 (15:55 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000 (15:55 -0400)
Conflicts:

drivers/net/e1000/e1000_ethtool.c

1  2 
drivers/net/e1000/e1000_ethtool.c patch | diff1 | diff2 | blob | history
drivers/net/e1000/e1000_main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/e1000/e1000_ethtool.c
Simple merge
diff --cc drivers/net/e1000/e1000_main.c
Simple merge
Domain: System / Uncategorized;