Skip to content
Commit 394e849b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18-rc4 into tty-next. 



This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 98267d33 206c5f60
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment