merge device_omap4-common to jbx's