Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / termios.h
2008-10-13 Alan Coxtty: Add termiox
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2