From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 13 Dec 2011 16:15:33 +0000 (-0500)
Subject: Merge branch 'stable/bug.fixes-3.3.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~830^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2194d9121baf8ee9ad97e48d7c17ecab6aabada5;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/bug.fixes-3.3.rebased' into uek2-merge

* stable/bug.fixes-3.3.rebased:
  x86/paravirt: Use pte_val instead of pte_flags on CPA pageattr_test
  x86/cpa: Use pte_attrs instead of pte_flags on CPA/set_p.._wb/wc operations.
  xen/pm_idle: Make pm_idle be default_idle under Xen.
---

2194d9121baf8ee9ad97e48d7c17ecab6aabada5