Merge branch 'stable/for-linus-3.7' into linux-next

* stable/for-linus-3.7:
  xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
  xen/swiotlb: Remove functions not needed anymore.
  xen: allow privcmd for HVM guests
  xen: Introduce xen_pfn_t for pfn and mfn types
  xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST
  xen/events: fix unmask_evtchn for PV on HVM guests
  xen/sysfs: Use XENVER_guest_handle to query UUID
  xen/apic/xenbus/swiotlb/pcifront/grant/tmem: Make functions or variables static.
  xen: missing includes
  xen: update xen_add_to_physmap interface
  xen/perf: Define .glob for the different hypercalls.

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc drivers/tty/hvc/hvc_xen.c
Simple merge

diff --cc include/xen/interface/platform.h
Simple merge

diff --cc include/xen/interface/xen.h
Simple merge