diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-18 22:34:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-18 22:34:11 +0100 |
| commit | 10baf04e95fbf7eb6089410220a547211dd2ffa7 (patch) | |
| tree | 912204612987a3ce2ec0ed214d47911040d79cc1 /net/rfkill/input.c | |
| parent | fdbe0946d4c35d4cc784cfe0a5322708cfb7ade8 (diff) | |
| parent | ca62cf59ceef10ff2ebca0e7f764507186870270 (diff) | |
| download | blackbird-op-linux-10baf04e95fbf7eb6089410220a547211dd2ffa7.tar.gz blackbird-op-linux-10baf04e95fbf7eb6089410220a547211dd2ffa7.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (35 commits)
PM idle: remove global declaration of pm_idle
unicore32 idle: delete stray pm_idle comment
openrisc idle: delete pm_idle
mn10300 idle: delete pm_idle
microblaze idle: delete pm_idle
m32r idle: delete pm_idle, and other dead idle code
ia64 idle: delete pm_idle
cris idle: delete idle and pm_idle
ARM64 idle: delete pm_idle
ARM idle: delete pm_idle
blackfin idle: delete pm_idle
sparc idle: rename pm_idle to sparc_idle
sh idle: rename global pm_idle to static sh_idle
x86 idle: rename global pm_idle to static x86_idle
APM idle: register apm_cpu_idle via cpuidle
tools/power turbostat: display SMI count by default
intel_idle: export both C1 and C1E
cpuidle: remove vestage definition of cpuidle_state_usage.driver_data
x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag
x86 idle: remove mwait_idle() and "idle=mwait" cmdline param
...
Conflicts:
arch/x86/kernel/process.c (with PM / tracing commit 43720bd)
drivers/acpi/processor_idle.c (with ACPICA commit 4f84291)
Diffstat (limited to 'net/rfkill/input.c')
0 files changed, 0 insertions, 0 deletions
