---

yaml
---
r: 141974
b: refs/heads/master
c: 6328a57
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e33b234abbb9a77806115d30c3084992a98973c
+refs/heads/master: 6328a57401dc5f5cf9931738eb7268fcd8058c49

trunk/Documentation/kernel-parameters.txt

@@ -258,22 +258,6 @@ and is between 256 and 4096 characters. It is defined in the file
 			to assume that this machine's pmtimer latches its value
 			and always returns good values.
 
-	acpi_enforce_resources=	[ACPI]
-			{ strict | lax | no }
-			Check for resource conflicts between native drivers
-			and ACPI OperationRegions (SystemIO and SystemMemory
-			only). IO ports and memory declared in ACPI might be
-			used by the ACPI subsystem in arbitrary AML code and
-			can interfere with legacy drivers.
-			strict (default): access to resources claimed by ACPI
-			is denied; legacy drivers trying to access reserved
-			resources will fail to bind to device using them.
-			lax: access to resources claimed by ACPI is allowed;
-			legacy drivers trying to access reserved resources
-			will bind successfully but a warning message is logged.
-			no: ACPI OperationRegions are not marked as reserved,
-			no further checks are performed.
-
 	agp=		[AGP]
 			{ off | try_unsupported }
 			off: disable AGP support

trunk/Documentation/laptops/acer-wmi.txt

@@ -1,9 +1,9 @@
 Acer Laptop WMI Extras Driver
 http://code.google.com/p/aceracpi
-Version 0.3
-4th April 2009
+Version 0.2
+18th August 2008
 
-Copyright 2007-2009 Carlos Corbacho <carlos@strangeworlds.co.uk>
+Copyright 2007-2008 Carlos Corbacho <carlos@strangeworlds.co.uk>
 
 acer-wmi is a driver to allow you to control various parts of your Acer laptop
 hardware under Linux which are exposed via ACPI-WMI.
@@ -36,10 +36,6 @@ not possible in kernel space from a 64 bit OS.
 Supported Hardware
 ******************
 
-NOTE: The Acer Aspire One is not supported hardware. It cannot work with
-acer-wmi until Acer fix their ACPI-WMI implementation on them, so has been
-blacklisted until that happens.
-
 Please see the website for the current list of known working hardare:
 
 http://code.google.com/p/aceracpi/wiki/SupportedHardware