Merge branch 'stable/not-upstreamed' into uek2-merge

Merge branch 'stable/not-upstreamed' into uek2-merge

* stable/not-upstreamed:
  xen/oprofile: Expose the oprofile_arch_exit_fnc pointer.
  xen/oprofile: Switch from syscore_ops to platform_ops.
  xen/oprofile: Fix compile issues when CONFIG_XEN is not defined.
  xen/oprofile: The arch_ variants for init/exec weren't being called.
  xen/oprofile: Compile fix
  xen/oprofile: Patch from Michael Petullo

Conflicts:
	arch/x86/xen/mmu.c
	drivers/oprofile/oprof.c
	include/xen/xen-ops.h