]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4ea75b efd51b5)
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 03:19:57 +0000 (22:19 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 03:19:57 +0000 (22:19 -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