]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c4b1d7 d4a4f75)
Merge 4.1-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:49:28 +0000 (10:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:49:28 +0000 (10:49 -0700)
This fixes up a merge issue with the amba-pl011.c driver, and we want
the fixes in this branch 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/imx.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/n_tty.c
Simple merge
diff --cc drivers/tty/serial/imx.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.