diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 10:48:48 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 10:48:48 -0700 | 
| commit | 7f02ab3ce3c7e093c414fcbd93bdc591cc4419d0 (patch) | |
| tree | b92453c1b0aa1234330855c5ac96627ebe8c82da /drivers/net/ibm_newemac/debug.c | |
| parent | d6fb1db02e02aea98f2d7e121fd30e24c84639d6 (diff) | |
| parent | 0dbb5671921b6dad2396090ef81a3efee1ae7da1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (25 commits)
  serial: Tidy REMOTE_DEBUG
  serial: isicomm: handle running out of slots
  serial: bfin_sport_uart: Use resource size to fix off-by-one error
  tty: fix obsolete comment on tty_insert_flip_string_fixed_flag
  serial: Add driver for the Altera UART
  serial: Add driver for the Altera JTAG UART
  serial: timbuart: make sure last byte is sent when port is closed
  serial: two branches the same in timbuart_set_mctrl()
  serial: uartlite: move from byte accesses to word accesses
  tty: n_gsm: depends on NET
  tty: n_gsm line discipline
  serial: TTY: new ldiscs for staging
  serial: bfin_sport_uart: drop redundant cpu depends
  serial: bfin_sport_uart: drop the experimental markings
  serial: bfin_sport_uart: pull in bfin_sport.h for SPORT defines
  serial: bfin_sport_uart: only enable SPORT TX if data is to be sent
  serial: bfin_sport_uart: drop useless status masks
  serial: bfin_sport_uart: zero sport_uart_port if allocated dynamically
  serial: bfin_sport_uart: protect changes to uart_port
  serial: bfin_sport_uart: add support for CTS/RTS via GPIOs
  ...
Diffstat (limited to 'drivers/net/ibm_newemac/debug.c')
0 files changed, 0 insertions, 0 deletions
