projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 50d1e7d 009d043)
Merge 3.18-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2014 16:17:24 +0000 (08:17 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2014 16:17:24 +0000 (08:17 -0800)
commitdd63af108f0814f0b589659f4e55a7a5af3b7e53
tree0a7679fecb5b516cddb2153c632a4262899be6c3tree | snapshot
parent50d1e7d1077b276e8faa9eebf8b710edf31fdeeacommit | diff
parent009d0431c3914de64666bec0d350e54fdd59df6acommit | diff
Merge 3.18-rc7 into tty-next

This resolves the merge issue with drivers/tty/serial/of_serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/tty/serial/of_serial.c diff1 | diff2 | blob | history
Domain: System / Kernel;