Update the kernel branch for p31xx

Change-Id: Ic6c3e4fbea5451c9887e114b91ccd5bd73167178