Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.