git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98267d3
206c5f6
)
Merge 3.18-rc4 into tty-next.
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 10 Nov 2014 03:42:04 +0000
(12:42 +0900)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 10 Nov 2014 03:42:04 +0000
(12:42 +0900)
This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Trivial merge