Merge branch 'merge' into next
[safe/jmp/linux-2.6] / drivers / char / tty_buffer.c
2008-10-13 Alan Coxtty: split the buffering from tty_io