This merges ugly whitespace we want to keep for consistency
along with the latest upstream changes.
Signed-off-by: NAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: NDave Airlie <airlied@redhat.com>