Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core

This commit is contained in:
Ingo Molnar
2009-02-24 18:22:39 +01:00
126 changed files with 3467 additions and 1057 deletions

View File

@@ -135,7 +135,7 @@ and is between 256 and 4096 characters. It is defined in the file
acpi= [HW,ACPI,X86-64,i386]
Advanced Configuration and Power Interface
Format: { force | off | ht | strict | noirq }
Format: { force | off | ht | strict | noirq | rsdt }
force -- enable ACPI if default was off
off -- disable ACPI if default was on
noirq -- do not use ACPI for IRQ routing