git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dbf5bef 949db15)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 25 Jan 2013 21:27:36 +0000 (13:27 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 25 Jan 2013 21:27:36 +0000 (13:27 -0800)
commit	9f9cba810f36d16f4e64477e879a69f6c47b389d
tree	d787abcbead1439d3f82f0719efe520fd9689f79	tree \| snapshot
parent	dbf5bef8da169b38db804996a661f8d634df8295	commit \| diff
parent	949db153b6466c6f7cad5a427ecea94985927311	commit \| 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

John Crispins staging tree