diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 13:45:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 13:45:11 +1000 |
| commit | 11c7da763c71972bdc9ca2e616b42d341a93b99d (patch) | |
| tree | 81781b1e1a13ea0f204a96027e9503d84b201865 /drivers/tty/tty_ioctl.c | |
| parent | 2ceb9a5580b214401882880a7467aad9ce3c7317 (diff) | |
| parent | 868d1721a2200244a4555193d4adc1133cfb3978 (diff) | |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/bluetooth/hci_ldisc.c
drivers/tty/serial/Makefile
Diffstat (limited to 'drivers/tty/tty_ioctl.c')
| -rw-r--r-- | drivers/tty/tty_ioctl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index 620c971422b6..53f2442c6099 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c @@ -1,6 +1,4 @@ /* - * linux/drivers/char/tty_ioctl.c - * * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds * * Modified by Fred N. van Kempen, 01/29/93, to add line disciplines |