| commit | ce86d35d2fd119d777fc72736732c8c9c3456698 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 10 12:19:58 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 10 12:19:58 2011 -0800 |
| tree | 531b2077d9db6b44285ad75196672b4d102e8f20 | |
| parent | b477958314796f51c54829dbaea89b1f46dabd06 [diff] | |
| parent | 0f66e50af53d39edebf4bc64ef90077e738c171f [diff] |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock 68360serial: Plumb in rs_360_get_icount() n_gsm: copy mtu over when configuring via ioctl interface virtio: console: Move file back to drivers/char/