merge: omap_next

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
3.16-rc5-armv7-x1 release

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