From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 27 May 2006 02:01:26 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=983f27d37d4fc72c252835cb2ee3103b360735a6;p=linux-2.6

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/s390/net/ctctty.c
---

983f27d37d4fc72c252835cb2ee3103b360735a6