]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3cf560 a7a80d5)
Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 17:07:07 +0000 (12:07 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 17:07:07 +0000 (12:07 -0500)
1  2 
drivers/net/s2io.c patch | diff1 | diff2 | blob | history

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