Merge 3.6-rc3 into tty-next

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>

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/ifx6x60.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/mos7840.c
Simple merge

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

diff --cc include/linux/Kbuild
Simple merge

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