format and remove trailing white space; makes 'make presubmit' pass
again.
Signed-off-by: Miek Gieben <miek@miek.nl>