diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-27 01:04:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-27 01:04:29 +0200 |
| commit | fc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch) | |
| tree | 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /drivers/tty/pty.c | |
| parent | pch_uart: Add eg20t_port lock field, avoid recursive spinlocks (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-fc915c8b930c3114f2a838f7e2cd8789ad6fedc3.tar.xz linux-fc915c8b930c3114f2a838f7e2cd8789ad6fedc3.zip | |
Merge 3.5-rc4 into tty-next
This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/pty.c')
0 files changed, 0 insertions, 0 deletions