Merge "IPANAT: Fix checkpatch errors"