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: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/misc/pch_phub.c
index 98bffc471b173d8e8f08b2a9d8308ac74d17fd0b,5dd0b921bfc63b62c2d434678dea82d5cf59c03c..380ba806495d33f2638130b9c67785f7289aac1d
--- 1/drivers/misc/pch_phub.c
--- 2/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@@ -46,11 -47,18 +47,22 @@@
  #define PCH_MINOR_NOS 1
  #define CLKCFG_CAN_50MHZ 0x12000000
  #define CLKCFG_CANCLK_MASK 0xFF000000
+ #define CLKCFG_UART_MASK                      0xFFFFFF
+ 
+ /* CM-iTC */
+ #define CLKCFG_UART_48MHZ                     (1 << 16)
+ #define CLKCFG_BAUDDIV                                (2 << 20)
+ #define CLKCFG_PLL2VCO                                (8 << 9)
+ #define CLKCFG_UARTCLKSEL                     (1 << 18)
+ 
+ /* Macros for ML7213 */
+ #define PCI_VENDOR_ID_ROHM                    0x10db
+ #define PCI_DEVICE_ID_ROHM_ML7213_PHUB                0x801A
  
 +/* Macros for ML7213 */
 +#define PCI_VENDOR_ID_ROHM                    0x10db
 +#define PCI_DEVICE_ID_ROHM_ML7213_PHUB                0x801A
 +
  /* SROM ACCESS Macro */
  #define PCH_WORD_ADDR_MASK (~((1 << 2) - 1))
  

diff --cc drivers/s390/char/keyboard.c
index 5ad44daef73bdf5ea54eac6e5885c068042d7dd1,d6673345c5f43637a87a1cb321705df0faa7d91d..806588192483798437796bccd817e1e3f2192386
--- 1/drivers/s390/char/keyboard.c
--- 2/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@@ -455,13 -455,10 +455,11 @@@ do_kdgkb_ioctl(struct kbd_data *kbd, st
        return 0;
  }
  
- int
- kbd_ioctl(struct kbd_data *kbd, struct file *file,
-         unsigned int cmd, unsigned long arg)
+ int kbd_ioctl(struct kbd_data *kbd, unsigned int cmd, unsigned long arg)
  {
        void __user *argp;
 -      int ct, perm;
 +      unsigned int ct;
 +      int perm;
  
        argp = (void __user *)arg;
  

diff --cc drivers/tty/ipwireless/main.c
Simple merge

diff --cc drivers/usb/serial/ch341.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge

diff --cc drivers/usb/serial/io_edgeport.c
Simple merge

diff --cc drivers/usb/serial/keyspan.c
Simple merge

diff --cc drivers/usb/serial/keyspan_pda.c
Simple merge

diff --cc drivers/usb/serial/kobil_sct.c
Simple merge

diff --cc drivers/usb/serial/mct_u232.c
index 1e225aacf46eeba81054fdc3ca37ab000ce4db40,ef49902c5a51a7a671eccd479768a12415a9e2db..d2c019637e459368efbb23b4f0d0156cddf872e3
--- 1/drivers/usb/serial/mct_u232.c
--- 2/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@@ -103,13 -101,9 +103,13 @@@ static void mct_u232_read_int_callback(
  static void mct_u232_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
  static void mct_u232_break_ctl(struct tty_struct *tty, int break_state);
- static int  mct_u232_tiocmget(struct tty_struct *tty, struct file *file);
- static int  mct_u232_tiocmset(struct tty_struct *tty, struct file *file,
+ static int  mct_u232_tiocmget(struct tty_struct *tty);
+ static int  mct_u232_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 +static int  mct_u232_ioctl(struct tty_struct *tty, struct file *file,
 +                      unsigned int cmd, unsigned long arg);
 +static int  mct_u232_get_icount(struct tty_struct *tty,
 +                      struct serial_icounter_struct *icount);
  static void mct_u232_throttle(struct tty_struct *tty);
  static void mct_u232_unthrottle(struct tty_struct *tty);
  

diff --cc drivers/usb/serial/mos7720.c
Simple merge

diff --cc drivers/usb/serial/opticon.c
Simple merge

diff --cc drivers/usb/serial/sierra.c
Simple merge

diff --cc drivers/usb/serial/usb-serial.c
Simple merge

diff --cc drivers/usb/serial/usb_wwan.c
Simple merge

diff --cc include/linux/usb/serial.h
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge