Linus Torvalds 56b85f32d5 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
  serial: apbuart: Fixup apbuart_console_init()
  TTY: Add tty ioctl to figure device node of the system console.
  tty: add 'active' sysfs attribute to tty0 and console device
  drivers: serial: apbuart: Handle OF failures gracefully
  Serial: Avoid unbalanced IRQ wake disable during resume
  tty: fix typos/errors in tty_driver.h comments
  pch_uart : fix warnings for 64bit compile
  8250: fix uninitialized FIFOs
  ip2: fix compiler warning on ip2main_pci_tbl
  specialix: fix compiler warning on specialix_pci_tbl
  rocket: fix compiler warning on rocket_pci_ids
  8250: add a UPIO_DWAPB32 for 32 bit accesses
  8250: use container_of() instead of casting
  serial: omap-serial: Add support for kernel debugger
  serial: fix pch_uart kconfig & build
  drivers: char: hvc: add arm JTAG DCC console support
  RS485 documentation: add 16C950 UART description
  serial: ifx6x60: fix memory leak
  serial: ifx6x60: free IRQ on error
  Serial: EG20T: add PCH_UART driver
  ...

Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).
2011-01-07 14:39:20 -08:00
..
2009-05-02 15:36:10 -07:00
2010-06-15 14:19:07 -04:00
2009-12-16 07:20:12 -08:00
2009-06-07 05:01:00 -07:00
2009-12-17 11:03:24 -05:00
2009-05-02 15:36:10 -07:00
2008-12-29 08:29:51 +01:00
2010-10-07 14:08:55 +01:00
2010-08-14 22:26:51 +02:00
2010-06-09 11:12:36 +02:00
2010-01-05 15:34:49 +09:00
2009-06-30 18:55:59 -07:00
2010-10-26 16:52:08 -07:00
2010-03-12 15:52:38 -08:00
2009-01-15 16:39:40 -08:00
2009-02-01 11:01:22 +05:30
2009-02-01 11:01:22 +05:30
2010-10-07 14:08:55 +01:00
2009-05-02 15:36:10 -07:00
2009-04-01 08:59:16 -07:00