Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

* '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

diff --combined MAINTAINERS
index 6a16f21117dfe9ecf281763e68c7a9f9cbce587a,4c4373300f5f7f91099f88b4c26e202011ff493b..716c548107dddd113fd68e256fa757bd3c8783f6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -161,7 -161,7 +161,7 @@@ M: Greg Kroah-Hartman <gregkh@suse.de
  L:    linux-serial@vger.kernel.org
  W:    http://serial.sourceforge.net
  S:    Maintained
- T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:    drivers/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -5910,7 -5910,7 +5910,7 @@@ S:      Maintaine
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@suse.de>
  S:    Maintained
- T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:    drivers/char/tty_*
  F:    drivers/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -6598,14 -6598,14 +6598,14 @@@ F:   drivers/platform/x8
  
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    xen-devel@lists.xensource.com
 +L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    xen-devel@lists.xensource.com
 +L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
@@@ -6613,7 -6613,7 +6613,7 @@@
  XEN HYPERVISOR INTERFACE
  M:    Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    xen-devel@lists.xen.org
 +L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
  L:    virtualization@lists.osdl.org
  S:    Supported
  F:    arch/x86/xen/