]> err.no Git - linux-2.6/commit
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)
commit983f27d37d4fc72c252835cb2ee3103b360735a6
tree8a7d3c3e251db494e285896debeb906473178a3e
parentde1e938e54deba5b093a3074dfafd0d11afacbe1
parente82b0f2cc21be905e504573483fa9542b15df96f
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/s390/net/ctctty.c
drivers/s390/net/ctcmain.c