---

yaml
---
r: 120575
b: refs/heads/master
c: 3d1ee37
h: refs/heads/master
i:
  120573: 0480174
  120571: 75edaf2
  120567: dbb240c
  120559: e473803
  120543: 12cd516
  120511: edb090a
  120447: c9364d0
  120319: e3a4434
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9649745c8670eacc671e9cff72c5c1e346e13036
+refs/heads/master: 3d1ee379bd576c0830050c2d313e77b9f98a8013

trunk/Documentation/arm/mem_alignment

@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user
 space, and might cause programs to fail unexpectedly.
 
 To change the alignment trap behavior, simply echo a number into
-/proc/cpu/alignment.  The number is made up from various bits:
+/proc/sys/debug/alignment.  The number is made up from various bits:
 
 bit		behavior when set
 ---		-----------------

trunk/Documentation/kernel-parameters.txt

@@ -220,17 +220,14 @@ and is between 256 and 4096 characters. It is defined in the file
 			Bits in debug_level correspond to a level in
 			ACPI_DEBUG_PRINT statements, e.g.,
 			    ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...
-			The debug_level mask defaults to "info".  See
-			Documentation/acpi/debug.txt for more information about
-			debug layers and levels.
+			See Documentation/acpi/debug.txt for more information
+			about debug layers and levels.
 
-			Enable processor driver info messages:
-			    acpi.debug_layer=0x20000000
-			Enable PCI/PCI interrupt routing info messages:
-			    acpi.debug_layer=0x400000
 			Enable AML "Debug" output, i.e., stores to the Debug
 			object while interpreting AML:
 			    acpi.debug_layer=0xffffffff acpi.debug_level=0x2
+			Enable PCI/PCI interrupt routing info messages:
+			    acpi.debug_layer=0x400000 acpi.debug_level=0x4
 			Enable all messages related to ACPI hardware:
 			    acpi.debug_layer=0x2 acpi.debug_level=0xffffffff