Merge "Clean up trailing whitespace in the kernel headers."