]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3f3165e3ac4eb25682d176e822a210860cdf33d2
tree0a7679fecb5b516cddb2153c632a4262899be6c3
parent707a1f97e437327a552d9fd5878ac873b8771002
parentba45561728c20faf2120fe597ce796d19e8b6a88
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
drivers/tty/serial/of_serial.c