Merge branch 'master' into for-linus
[cascardo/linux.git] / arch / x86 / include / asm / termios.h
1 #include <asm-generic/termios.h>