]> 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)
commite9bf2b787c63e1931435b29297c6924426823887
tree0a7679fecb5b516cddb2153c632a4262899be6c3
parent86533e1b9d240798cc705926a62e304743804ec5
parent40407ab9c7030192d9d5dc25ea3e5e4b3b1010ec
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