]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 351d620 413541d)
Merge 3.13-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:10:47 +0000 (10:10 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:10:47 +0000 (10:10 -0800)
We need the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/n_tty.c patch | diff1 | diff2 | blob | history
drivers/tty/serial/8250/8250_dw.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/n_tty.c
Simple merge
diff --cc drivers/tty/serial/8250/8250_dw.c
Simple merge
XArray, radix tree and IDR