Merge 2.6.38-rc6 into tty-next

This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/Makefile
index 3ca1f627be8a049e2eb49699c835e21573c97ef4,8238f89f73c9398c811ba321c044f50efb4cfecc..057f65452e7ba67e6fe6863c9ac5aebaa6e59e48
--- 1/drivers/char/Makefile
--- 2/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -5,7 -5,32 +5,8 @@@
  obj-y                         += mem.o random.o
  obj-$(CONFIG_TTY_PRINTK)      += ttyprintk.o
  obj-y                         += misc.o
 -obj-$(CONFIG_BFIN_JTAG_COMM)  += bfin_jtag_comm.o
 -obj-$(CONFIG_MVME147_SCC)     += generic_serial.o vme_scc.o
 -obj-$(CONFIG_MVME162_SCC)     += generic_serial.o vme_scc.o
 -obj-$(CONFIG_BVME6000_SCC)    += generic_serial.o vme_scc.o
 -obj-$(CONFIG_ROCKETPORT)      += rocket.o
 -obj-$(CONFIG_SERIAL167)               += serial167.o
 -obj-$(CONFIG_CYCLADES)                += cyclades.o
 -obj-$(CONFIG_STALLION)                += stallion.o
 -obj-$(CONFIG_ISTALLION)               += istallion.o
 -obj-$(CONFIG_NOZOMI)          += nozomi.o
 -obj-$(CONFIG_DIGIEPCA)                += epca.o
 -obj-$(CONFIG_SPECIALIX)               += specialix.o
 -obj-$(CONFIG_MOXA_INTELLIO)   += moxa.o
 -obj-$(CONFIG_A2232)           += ser_a2232.o generic_serial.o
  obj-$(CONFIG_ATARI_DSP56K)    += dsp56k.o
 -obj-$(CONFIG_MOXA_SMARTIO)    += mxser.o
 -obj-$(CONFIG_COMPUTONE)               += ip2/
 -obj-$(CONFIG_RISCOM8)         += riscom8.o
 -obj-$(CONFIG_ISI)             += isicom.o
 -obj-$(CONFIG_SYNCLINK)                += synclink.o
 -obj-$(CONFIG_SYNCLINKMP)      += synclinkmp.o
 -obj-$(CONFIG_SYNCLINK_GT)     += synclink_gt.o
 -obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 -obj-$(CONFIG_SX)              += sx.o generic_serial.o
 -obj-$(CONFIG_RIO)             += rio/ generic_serial.o
+ obj-$(CONFIG_VIRTIO_CONSOLE)  += virtio_console.o
  obj-$(CONFIG_RAW_DRIVER)      += raw.o
  obj-$(CONFIG_SGI_SNSC)                += snsc.o snsc_event.o
  obj-$(CONFIG_MSPEC)           += mspec.o

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/tty/hvc/Makefile
index 7b0edbce900935b89c887baf94fd1c95502478f7,d79e7e9bf9d2750f964534083e4829ffb70ffd62..40a25d93fe52c830cfd4f344b1b22e2aaa5c557c
--- 1/drivers/tty/hvc/Makefile
--- 2/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@@ -9,6 -9,4 +9,5 @@@ obj-$(CONFIG_HVC_IRQ)            += hvc_irq.
  obj-$(CONFIG_HVC_XEN)         += hvc_xen.o
  obj-$(CONFIG_HVC_IUCV)                += hvc_iucv.o
  obj-$(CONFIG_HVC_UDBG)                += hvc_udbg.o
 +obj-$(CONFIG_HVC_BFIN_JTAG)   += hvc_bfin_jtag.o
  obj-$(CONFIG_HVCS)            += hvcs.o
- obj-$(CONFIG_VIRTIO_CONSOLE)  += virtio_console.o

diff --cc drivers/tty/n_gsm.c
Simple merge

diff --cc drivers/tty/serial/68328serial.c
index 1de0e8d4bde15aef094f8cace0de7306fcf73a42,de0160e3f8c4fcdb8797606331ac718fe0882631..d5bfd41707e754c0c5803eb8d30c751927052c65
--- 1/drivers/tty/serial/68328serial.c
--- 2/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@@ -945,10 -967,9 +945,9 @@@ static void send_break(struct m68k_seri
          local_irq_restore(flags);
  }
  
 -static int rs_ioctl(struct tty_struct *tty, struct file * file,
 +static int rs_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
  {
-       int error;
        struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
        int retval;
  

diff --cc drivers/tty/serial/68360serial.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.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/ti_usb_3410_5052.c
Simple merge