]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/bug.fixes-3.3.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 13 Dec 2011 16:15:33 +0000 (11:15 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 13 Dec 2011 16:15:33 +0000 (11:15 -0500)
commit2194d9121baf8ee9ad97e48d7c17ecab6aabada5
treec47eb703e537887a08ef2b4baf3c7a463fb7d3fb
parent307f80d5bf10744e71ea52c977d1c76d700983b4
parent8cfa86623c75457aa2eec12e15ff7fd0b9fbf035
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.
arch/x86/xen/setup.c