In general, it's considered bad form to include whitespace changes in the same commit as functionality changes.

In this particular case, I would probably make them separate pull requests.