From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 19 Apr 2012 21:54:38 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~543^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5bd31c7969777c1b846322fe2b6ae00add75e88f;p=users%2Fjedix%2Flinux-maple.git

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.
  ...
---

5bd31c7969777c1b846322fe2b6ae00add75e88f