]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: d696e46 5d9795e)
Merge branch 'stable/cpufreq-xen.v6.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 27 Feb 2012 01:08:48 +0000 (20:08 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 27 Feb 2012 01:08:48 +0000 (20:08 -0500)
commit2fa5344c95525da55cd6896af85541fc23c1bdc0
treeba08f43f680643794f422fa859e38c49bf50d60ftree
parentd696e467d97b748cab14eb1b9910bf45f2044033commit | diff
parent5d9795e44484cfee502e33aefc3d4c3a01a8bfcdcommit | diff
Merge branch 'stable/cpufreq-xen.v6.rebased' into uek2-merge

* stable/cpufreq-xen.v6.rebased:
  [CPUFREQ] xen: governor for Xen hypervisor frequency scaling.
  xen/enlighten: Expose MWAIT and MWAIT_LEAF if hypervisor OKs it.

Conflicts:
drivers/xen/Kconfig
drivers/xen/Makefile
drivers/xen/Kconfig diff1 | diff2 | blob | history
drivers/xen/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.