v2014.07-rc3: omap

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