---

yaml
---
r: 144518
b: refs/heads/master
c: a8f6fae
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a133e775d533c0035af627693dec288f1b1d4ffc
+refs/heads/master: a8f6faebaf5b3f0f56b7c12a4f99d97c56938b37

trunk/Documentation/ABI/testing/sysfs-firmware-acpi

@@ -69,13 +69,9 @@ Description:
 		gpe1F:	     0	invalid
 		gpe_all:    1192
 		sci:	1194
-		sci_not:     0	
 
-		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.
+		sci - The total number of times the ACPI SCI
+		has claimed an interrupt.
 
 		gpe_all - count of SCI caused by GPEs.
 

trunk/Documentation/laptops/thinkpad-acpi.txt

@@ -1,7 +1,7 @@
 		     ThinkPad ACPI Extras Driver
 
-                            Version 0.23
-                          April 10th, 2009
+                            Version 0.22
+                        November 23rd,  2008
 
                Borislav Deianov <borislav@users.sf.net>
              Henrique de Moraes Holschuh <hmh@hmh.eng.br>

trunk/arch/arm/Kconfig

@@ -585,8 +585,6 @@ config ARCH_DAVINCI
 	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_CLK
 	select ZONE_DMA
-	select HAVE_IDE
-	select COMMON_CLKDEV
 	help
 	  Support for TI's DaVinci platform.