From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 13 Dec 2011 17:34:43 +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
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa24dbafaddd98666b0c6091976215b36b57fdcd;p=users%2Fjedix%2Flinux-maple.git

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

* stable/bug.fixes-3.3.rebased:
  Revert "xen/pm_idle: Make pm_idle be default_idle under Xen."
---

aa24dbafaddd98666b0c6091976215b36b57fdcd