omap_next: merge in the current state of things

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