From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 7 May 2012 18:28:53 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~423^2~63^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c78d6a081162f948e9453b509c03e8e2eb27f8e0;p=users%2Fjedix%2Flinux-maple.git

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

* stable/for-linus-3.4.rebased:
  Revert "xen-blkfront: set pages are FOREIGN_FRAME when sharing them"

Fixes Bug 14028600
---

c78d6a081162f948e9453b509c03e8e2eb27f8e0