]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de1e938 e82b0f2)
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 02:01:26 +0000 (22:01 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 02:01:26 +0000 (22:01 -0400)
Conflicts:

drivers/s390/net/ctctty.c

1  2 
drivers/s390/net/ctcmain.c patch | diff1 | diff2 | blob | history

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