diff --git a/[refs] b/[refs]
index 9671cd5a3e76..0091a16ae056 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a51f4a81e737735668206ad1618ce4a84cf362e7
+refs/heads/master: 1ab54a936d75b1b100c998c8e2717fafd0b4c3b6
diff --git a/trunk/Documentation/ia64/serial.txt b/trunk/Documentation/ia64/serial.txt
index f51eb4bc2ff1..040b9773209f 100644
--- a/trunk/Documentation/ia64/serial.txt
+++ b/trunk/Documentation/ia64/serial.txt
@@ -124,6 +124,13 @@ TROUBLESHOOTING SERIAL CONSOLE PROBLEMS
 
 	- Add entry to /etc/securetty for console tty.
 
+    No ACPI serial devices found in 2.6.17 or later:
+
+	- Turn on CONFIG_PNP and CONFIG_PNPACPI.  Prior to 2.6.17, ACPI
+	  serial devices were discovered by 8250_acpi.  In 2.6.17,
+	  8250_acpi was replaced by the combination of 8250_pnp and
+	  CONFIG_PNPACPI.
+
 
 
 [1] http://www.dig64.org/specifications/DIG64_PCDPv20.pdf