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

* stable/for-linus-3.4.rebased: (29 commits)
  xen/blkback: Fix warning error.
  xen/blkback: Make optional features be really optional.
  xen-blkfront: module exit handling adjustments
  xen-blkfront: properly name all devices
  xen-blkfront: set pages are FOREIGN_FRAME when sharing them
  xen: EXPORT_SYMBOL set_phys_to_machine
  xen-blkfront: make blkif_io_lock spinlock per-device
  xen/blkfront: don't put bdev right after getting it
  xen-blkfront: use bitmap_set() and bitmap_clear()
  xen/blkback: Enable blkback on HVM guests
  xen/blkback: use grant-table.c hypercall wrappers
  xen/p2m: m2p_find_override: use list_for_each_entry_safe
  xen/gntdev: do not set VM_PFNMAP
  xen/grant-table: add error-handling code on failure of gnttab_resume
  xen: only check xen_platform_pci_unplug if hvm
  xen: initialize platform-pci even if xen_emul_unplug=never
  xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
  xen: support pirq_eoi_map
  xen/smp: Remove unnecessary call to smp_processor_id()
  xen/smp: Fix bringup bug in AP code.
  ...

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

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

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

diff --cc drivers/block/xen-blkback/blkback.c
Simple merge

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/xen/events.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe_frontend.c
Simple merge

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