]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d106847 4bcef79)
Merge 3.8-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Jan 2013 21:27:36 +0000 (13:27 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Jan 2013 21:27:36 +0000 (13:27 -0800)
commit0a457a056786e781479c6868bc9ddd908d60b4a6
treed787abcbead1439d3f82f0719efe520fd9689f79tree | snapshot
parentd10684785680319a67a2a9b7a9a434239a878039commit | diff
parent4bcef794c53660c544eaf850f64ba85d4a61e2a9commit | diff
Merge 3.8-rc5 into tty-next

This resolves a number of tty driver merge issues found in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18 files changed:
drivers/s390/char/con3215.c diff1 | diff2 | blob | history
drivers/staging/fwserial/Kconfig diff1 | diff2 | blob | history
drivers/staging/fwserial/fwserial.c diff1 | diff2 | blob | history
drivers/staging/sb105x/Kconfig diff1 | diff2 | blob | history
drivers/tty/pty.c diff1 | diff2 | blob | history
drivers/tty/serial/8250/8250.c diff1 | diff2 | blob | history
drivers/tty/serial/8250/8250.h diff1 | diff2 | blob | history
drivers/tty/serial/8250/8250_dw.c diff1 | diff2 | blob | history
drivers/tty/serial/8250/8250_pci.c diff1 | diff2 | blob | history
drivers/tty/serial/ifx6x60.c diff1 | diff2 | blob | history
drivers/tty/serial/mxs-auart.c diff1 | diff2 | blob | history
drivers/tty/serial/samsung.c diff1 | diff2 | blob | history
drivers/tty/serial/vt8500_serial.c diff1 | diff2 | blob | history
drivers/usb/class/cdc-acm.c diff1 | diff2 | blob | history
drivers/usb/gadget/u_serial.c diff1 | diff2 | blob | history
drivers/usb/serial/ftdi_sio.c diff1 | diff2 | blob | history
drivers/usb/serial/io_ti.c diff1 | diff2 | blob | history
include/uapi/linux/serial_core.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.