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

projects / openwrt / staging / blogic.git / commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 6 Aug 2012 16:48:31 +0000 (09:48 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 6 Aug 2012 16:48:31 +0000 (09:48 -0700)
commit	c87985a3ce723995fc7b25e598238d67154108a1
tree	e60def1b77c25c1d74180f62e8a5603f9826f209	tree \| snapshot
parent	d155255a344c417acad74156654295a2964e6b81	commit \| diff
parent	0d7614f09c1ebdbaa1599a5aba7593f147bf96ee	commit \| diff

Merge tty-next into 3.6-rc1

This handles the merge issue in:
arch/um/drivers/line.c
arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

John Crispins staging tree

RSS Atom

drivers/net/ethernet/sgi/ioc3-eth.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/amba-pl011.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/keyspan.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/quatech2.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/sierra.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/tty.c	diff1 \|	diff2 \|	blob \| history