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

Merge some Freescale updates from Scott Wood