Merge remote-tracking branch 'kumar/next' into next

Freescale updates for 3.6