diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 16:02:30 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 16:02:30 -0800 | 
| commit | edaa4d668babd65e98e1452043996bbefc0285b0 (patch) | |
| tree | a6cf4c6083ae49e8d1b7a4efc92a32864a79e534 /fs/ntfs/mst.c | |
| parent | 891cbd30ef456664e50bbd28436ef3006a81cf7c (diff) | |
| parent | 40e3465db2cffd64e069ca82ee981025554bc159 (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:
  n_gsm: Fix length handling
  n_gsm: Copy n2 over when configuring via ioctl interface
  serial: bfin_5xx: grab port lock before making port termios changes
  serial: bfin_5xx: disable CON_PRINTBUFFER for consoles
  serial: bfin_5xx: remove redundant SSYNC to improve TX speed
  serial: bfin_5xx: always include DMA headers
  vcs: make proper usage of the poll flags
  amiserial: Remove unused variable icount
  8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang
  tty_ldisc: Fix BUG() on hangup
  TTY: restore tty_ldisc_wait_idle
  SERIAL: blacklist si3052 chip
  drivers/serial/bfin_5xx.c: Fix line continuation defects
  tty: prevent DOS in the flush_to_ldisc
  8250: add support for Kouwell KW-L221N-2
  nozomi: Fix warning from the previous TIOCGCOUNT changes
  tty: fix warning in synclink driver
  tty: Fix formatting in tty.h
  tty: the development tree is now done in git
Diffstat (limited to 'fs/ntfs/mst.c')
0 files changed, 0 insertions, 0 deletions
