This removes some minor differences between Linus' tree and the main
ARM tree; comment clarification and some weird formatting.