summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Rafael J. Wysocki2013-02-1835-553/+360
|\
| * Merge branch 'misc' into releaseLen Brown2013-02-188-140/+15
| |\
| | * x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flagLen Brown2013-02-106-50/+2
| | * x86 idle: remove mwait_idle() and "idle=mwait" cmdline paramLen Brown2013-02-105-87/+4
| | * xen idle: make xen-specific macro xen-specificLen Brown2013-02-103-3/+9
| | |
| | \
| *-. \ Merge branches 'idle-remove-statedata', 'pm_idle' and 'idle-hsw-turbostat' in...Len Brown2013-02-1826-252/+281
| |\ \ \
| | | * | tools/power turbostat: display SMI count by defaultLen Brown2013-02-133-24/+39
| | | * | intel_idle: export both C1 and C1ELen Brown2013-02-131-5/+49
| | | * | intel_idle: remove assumption of one C-state per MWAIT flagLen Brown2013-02-082-51/+61
| | | * | intel_idle: remove use and definition of MWAIT_MAX_NUM_CSTATESLen Brown2013-02-082-9/+8
| | | * | tools/power turbostat: decode MSR_IA32_POWER_CTLLen Brown2013-02-082-6/+9
| | | * | tools/power turbostat: support HaswellLen Brown2013-02-081-1/+10
| | | * | intel_idle: support HaswellLen Brown2013-02-081-0/+39
| | * | | PM idle: remove global declaration of pm_idleLen Brown2013-02-171-1/+0
| | * | | unicore32 idle: delete stray pm_idle commentLen Brown2013-02-171-5/+0
| | * | | openrisc idle: delete pm_idleLen Brown2013-02-171-5/+0
| | * | | mn10300 idle: delete pm_idleLen Brown2013-02-171-7/+0
| | * | | microblaze idle: delete pm_idleLen Brown2013-02-171-3/+0
| | * | | m32r idle: delete pm_idle, and other dead idle codeLen Brown2013-02-171-49/+2
| | * | | ia64 idle: delete pm_idleLen Brown2013-02-172-4/+0
| | * | | cris idle: delete idle and pm_idleLen Brown2013-02-171-10/+1
| | * | | ARM64 idle: delete pm_idleLen Brown2013-02-171-9/+4
| | * | | ARM idle: delete pm_idleLen Brown2013-02-171-9/+4
| | * | | blackfin idle: delete pm_idleLen Brown2013-02-171-7/+0
| | * | | sparc idle: rename pm_idle to sparc_idleLen Brown2013-02-175-8/+11
| | * | | sh idle: rename global pm_idle to static sh_idleLen Brown2013-02-171-6/+6
| | * | | x86 idle: rename global pm_idle to static x86_idleLen Brown2013-02-171-16/+12
| | * | | APM idle: register apm_cpu_idle via cpuidleLen Brown2013-02-173-26/+35
| | | |/ | | |/|
| * | | cpuidle: remove vestage definition of cpuidle_state_usage.driver_dataLen Brown2013-02-111-22/+0
| | | |
| | \ \
| *-. \ \ Merge branches 'acpi-idle', 'arm-idle' and 'intel-idle' into idle-remove-stat...Len Brown2013-02-082-108/+51
| |\ \ \ \ | | | | |/ | | | |/|
| | | * | intel_idle: stop using driver_data for static flagsLen Brown2013-02-011-49/+26
| | | |/
| | * | davinci: cpuidle - remove useless initializationDaniel Lezcano2013-02-081-2/+0
| | * | davinci: cpuidle - remove the opsDaniel Lezcano2013-02-081-31/+2
| | * | davinci: cpuidle - move code to prevent forward declarationDaniel Lezcano2013-02-081-36/+36
| | * | Replace the flag by a simple global boolean in the cpuidle.c.Daniel Lezcano2013-02-081-13/+10
| | |/
| * | ACPI / idle: remove usage of the statedataDaniel Lezcano2013-02-081-12/+7
| * | ACPI / idle: pass the cpuidle_device parameterDaniel Lezcano2013-02-081-5/+6
| * | ACPI / idle : remove pointless headersDaniel Lezcano2013-02-081-12/+1
| * | ACPI / idle: remove unused definitionDaniel Lezcano2013-02-081-4/+0
| |/
* | Merge branch 'pm-cpufreq'Rafael J. Wysocki2013-02-173-6/+22
|\ \
| * | cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.Dirk Brandewie2013-02-152-0/+21
| * | cpufreq / intel_pstate: Change to disallow module buildDirk Brandewie2013-02-151-6/+1
* | | Merge branch 'next/cpufreq-exynos' of git://git.kernel.org/pub/scm/linux/kern...Rafael J. Wysocki2013-02-155-663/+248
|\ \ \
| * | | cpufreq: exynos: Fix hang in pm handler due to frequency mismatchJonghwan Choi2013-02-041-3/+5
| * | | cpufreq: exynos: Initialize return variableSachin Kamat2013-01-311-1/+1
| * | | cpufreq: exynos: Fix unsigned variable being checked for negative valueSachin Kamat2013-01-251-1/+1
| * | | cpufreq: exynos: Get booting freq value in exynos_cpufreq_initJonghwan Choi2013-01-181-2/+2
| * | | cpufreq: exynos: Show list of available frequenciesInderpal Singh2013-01-181-0/+13
| * | | cpufreq: exynos: Add missing staticJonghwan Choi2012-12-233-3/+3
| * | | cpufreq: exynos: Split exynos_target function into two functionsJonghwan Choi2012-12-231-65/+86
OpenPOWER on IntegriCloud