Merge omap-drivers