diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-27 12:17:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-27 12:17:49 +1000 |
| commit | 7400b4840666240bd8086dc8b32f53d0081a9233 (patch) | |
| tree | 08ab8dfda2772c612d9459feb985aa5ad2227e49 /drivers/tty/serial/vt8500_serial.c | |
| parent | 17c2affefafdb910a8854163cbf7405984bd2dab (diff) | |
| parent | 83c67571b372c4a40023a84e183fdb7fa4e89e48 (diff) | |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/bluetooth/hci_ldisc.c
Diffstat (limited to 'drivers/tty/serial/vt8500_serial.c')
| -rw-r--r-- | drivers/tty/serial/vt8500_serial.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 322bf56c0d89..37fc4e3d487c 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c @@ -1,6 +1,4 @@ /* - * drivers/serial/vt8500_serial.c - * * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> * * Based on msm_serial.c, which is: |