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