Merge branch 'from-linus' into upstream
[linux-2.6] / arch / um / os-Linux / tty.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2