3.8: cleanup: git am --whitespace=fix is your friend, specially with merging patches into massive patchsets

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>