From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 2 Feb 2012 19:12:34 +0000 (-0500)
Subject: Merge branch 'stable/vmalloc-3.2.rebased' into stable/for-linus-3.3.rebased
X-Git-Tag: v2.6.39-400.9.0~595^2~14^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f072a83f292016a99b19da18f4d6d755f6f6ef06;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/vmalloc-3.2.rebased' into stable/for-linus-3.3.rebased

* stable/vmalloc-3.2.rebased:
  xen: map foreign pages for shared rings by updating the PTEs directly
  net: xen-netback: use API provided by xenbus module to map rings
  block: xen-blkback: use API provided by xenbus module to map rings
  xen: use generic functions instead of xen_{alloc, free}_vm_area()
---

f072a83f292016a99b19da18f4d6d755f6f6ef06