merge in imx/omap for next plus a saucy fix

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>