git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sun, 14 Feb 2016 22:36:04 +0000 (14:36 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sun, 14 Feb 2016 22:36:04 +0000 (14:36 -0800)
commit	ead35f7970f8fa27c40f417ced0603fb31345ca0
tree	58abfec8444741fd3bd403a908be50c4f63d4842	tree \| snapshot
parent	bbcdbd9ebfce578b8fa17bc70b933695e7d222df	commit \| diff
parent	6f7ac95c87b62c01cc6bd12f75e64f8ab4e5f28b	commit \| diff

Merge 4.5-rc4 into tty-next

We want the fixes in here, and this resolves a merge error in tty_io.c

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

Linux Kernel Source Tree.

RSS Atom

drivers/tty/pty.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/omap-serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/tty_mutex.c	diff1 \|	diff2 \|	blob \| history