Merge 3.6-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:13:33 +0000 (07:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:13:33 +0000 (07:13 -0700)
This picks up all of the different fixes in Linus's tree that we also need here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serial/Kconfig
drivers/tty/serial/ifx6x60.c
drivers/usb/class/cdc-acm.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/mos7840.c
drivers/usb/serial/usb_wwan.c
include/linux/Kbuild
net/bluetooth/rfcomm/tty.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge