Other serial driver work wants to build on patches now in 4.2-rc4 so
merge the branch so this can properly happen.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>