Corrected indentation on conflicted source files.
Reviewed by: ambrisko MFC after: 2 weeks Sponsored by: AVAGO Technologies