Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge

Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge

* stable/for-linus-3.6.rebased:
  xen PVonHVM: move shared_info to MMIO before kexec
  xen: simplify init_hvm_pv_info
  xen: remove cast from HYPERVISOR_shared_info assignment
  xen: enable platform-pci only in a Xen guest
  xen/pv-on-hvm kexec: shutdown watches from old kernel
  Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
  xen/hvc: Fix up checks when the info is allocated.
  xen/mm: zero PTEs for non-present MFNs in the initial page table
  xen/mm: do direct hypercall in xen_set_pte() if batching is unavailable
  xen/x86: add desc_equal() to compare GDT descriptors
  x86/xen: avoid updating TLS descriptors if they haven't changed
  xen: populate correct number of pages when across mem boundary (v2)
  xen/mce: add .poll method for mcelog device driver

Conflicts:
	drivers/xen/xenbus/xenbus_xs.c
	include/xen/interface/io/xs_wire.h