Merge 2.6.38-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Feb 2011 19:36:31 +0000 (11:36 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Feb 2011 19:36:31 +0000 (11:36 -0800)
commitf227e08b71b9c273eaa29a57370a3a5b833aa382
tree9f1483776a2bde3bb1a6bd744e69acf19f6f3428
parentfec38d1752c01ad72789bac9f1a128f7e933735d
parentf5412be599602124d2bdd49947b231dd77c0bf99
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>
MAINTAINERS
drivers/char/Makefile
drivers/net/usb/hso.c
drivers/tty/hvc/Makefile
drivers/tty/n_gsm.c
drivers/tty/serial/68328serial.c
drivers/tty/serial/68360serial.c
drivers/usb/class/cdc-acm.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/ti_usb_3410_5052.c