---

yaml
---
r: 118992
b: refs/heads/master
c: 6b0eea2
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52168e60f7d86d83124903098ac8c2dba93cd1c4
+refs/heads/master: 6b0eea21efed26f92e18741e54a3121cf5cd197e

trunk/Documentation/00-INDEX

@@ -290,8 +290,6 @@ powerpc/
 	- directory with info on using Linux with the PowerPC.
 preempt-locking.txt
 	- info on locking under a preemptive kernel.
-printk-formats.txt
-	- how to get printk format specifiers right
 prio_tree.txt
 	- info on radix-priority-search-tree use for indexing vmas.
 ramdisk.txt

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

@@ -89,7 +89,7 @@ Description:
 
 		error - an interrupt that can't be accounted for above.
 
-		invalid: it's either a GPE or a Fixed Event that
+		invalid: it's either a wakeup GPE or a GPE/Fixed Event that
 			doesn't have an event handler.
 
 		disable: the GPE/Fixed Event is valid but disabled.
@@ -117,30 +117,30 @@ Description:
 		and other user space applications so that the machine won't shutdown
 		when pressing the power button.
 		# cat ff_pwr_btn
-		0	enabled
+		0
 		# press the power button for 3 times;
 		# cat ff_pwr_btn
-		3	enabled
+		3
 		# echo disable > ff_pwr_btn
 		# cat ff_pwr_btn
-		3	disabled
+		disable
 		# press the power button for 3 times;
 		# cat ff_pwr_btn
-		3	disabled
+		disable
 		# echo enable > ff_pwr_btn
 		# cat ff_pwr_btn
-		4	enabled
+		4
 		/*
 		 * this is because the status bit is set even if the enable bit is cleared,
 		 * and it triggers an ACPI fixed event when the enable bit is set again
 		 */
 		# press the power button for 3 times;
 		# cat ff_pwr_btn
-		7	enabled
+		7
 		# echo disable > ff_pwr_btn
 		# press the power button for 3 times;
 		# echo clear > ff_pwr_btn	/* clear the status bit */
 		# echo disable > ff_pwr_btn
 		# cat ff_pwr_btn
-		7	enabled
+		7