Merge 3.9-rc3 into tty-next

diff --cc arch/um/drivers/chan_kern.c
Simple merge

diff --cc arch/um/drivers/line.c
Simple merge

diff --cc drivers/isdn/i4l/isdn_tty.c
Simple merge

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

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

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