Merge commit 'v2.6.30' into for-2.6.31

git-mirror · Jun 16, 2009 · 7eef409 · 7eef409
2 parents 0a93a47 + 07a2039
commit 7eef409
Show file tree

Hide file tree

Showing 1,647 changed files with 42,819 additions and 29,266 deletions.
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi
@@ -69,9 +69,13 @@ Description:
 		gpe1F:	     0	invalid
 		gpe_all:    1192
 		sci:	1194
+		sci_not:     0	
 
-		sci - The total number of times the ACPI SCI
-		has claimed an interrupt.
+		sci - The number of times the ACPI SCI
+		has been called and claimed an interrupt.
+
+		sci_not - The number of times the ACPI SCI
+		has been called and NOT claimed an interrupt.
 
 		gpe_all - count of SCI caused by GPEs.