kernel-merge: Fix up whitespace and formatting

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>