]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7da4b8b 44549e8)
Merge 4.6-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:39:13 +0000 (09:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:39:13 +0000 (09:39 +0200)
We want the pty fixes in here as well so that patches can build on it.

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

diff --cc drivers/tty/pty.c
Simple merge
diff --cc drivers/tty/tty_io.c
Simple merge
XArray, radix tree and IDR