Auto merge with /home/aegl/GIT/ia64-test
[powerpc.git] / arch / um / kernel / tty_log.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2