]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 307f80d 8cfa866)
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)
* 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.

1  2 
arch/x86/xen/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/setup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.