projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit00fda1682efdbd62a20a8a21aee52d994c323c7f
treef49cee6c892019f193bf29985604951dd81ea94dtree | snapshot
parent1c4b1d73bacc546ba4e42f7eb4cb88c54139820bcommit | diff
parentd4a4f75cd8f29cd9464a5a32e9224a91571d6649commit | diff
Merge 4.1-rc7 into tty-next

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>
drivers/tty/n_tty.c diff1 | diff2 | blob | history
drivers/tty/serial/imx.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.