From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Feb 2012 05:03:16 +0000 (-0800)
Subject: Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=500dd2370e77c9551ba298bdeeb91b02d8402199;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git./linux/kernel/git/konrad/xen

Two fixes to fix a memory corruption bug when WC pages never get
converted back to WB but end up being recycled in the general memory
pool as WC.

There is a better way of fixing this, but there is not enough time to do
the full benchmarking to pick one of the right options - so picking the
one that favors stability for right now.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

* tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pat: Disable PAT support for now.
  xen/setup: Remove redundant filtering of PTE masks.
---

500dd2370e77c9551ba298bdeeb91b02d8402199