Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git] / arch / um / os-Linux / tty.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2