tag 3f1d489e5133227f5b64101ddddad29934f80474
tagger James Bottomley <JBottomley@Parallels.com> Sat Mar 31 08:32:11 2012 +0100
object 500dd2370e77c9551ba298bdeeb91b02d8402199

PARISC master on 20120331

commit 500dd2370e77c9551ba298bdeeb91b02d8402199
author Linus Torvalds <torvalds@linux-foundation.org> Sun Feb 26 21:03:16 2012 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Feb 26 21:03:16 2012 -0800
tree a1e94caef4032fec934aee7da34d6551a80e7da7
parent f6bd5798f3b7583f7e984f8408ffb5b36ece174f
parent 8eaffa67b43e99ae581622c5133e20b0f48bcef1

Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/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.