Merge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmk