This just realigns some code/whitespace between the kernel and main tree
Signed-off-by: NDave Airlie <airlied@linux.ie>