Taking serial driver from upstream, eleminating all local diffs after review