summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exstore.c
diff options
context:
space:
mode:
authorLen Brown2009-01-09 09:39:43 +0100
committerLen Brown2009-01-09 09:39:43 +0100
commitb2576e1d4408e134e2188c967b1f28af39cd79d4 (patch)
tree004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/acpi/acpica/exstore.c
parentMerge branch 'suspend' into release (diff)
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff)
downloadkernel-qcow2-linux-b2576e1d4408e134e2188c967b1f28af39cd79d4.tar.gz
kernel-qcow2-linux-b2576e1d4408e134e2188c967b1f28af39cd79d4.tar.xz
kernel-qcow2-linux-b2576e1d4408e134e2188c967b1f28af39cd79d4.zip
Merge branch 'linus' into release
Diffstat (limited to 'drivers/acpi/acpica/exstore.c')
-rw-r--r--drivers/acpi/acpica/exstore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 7c6d7e53e41e..e35e9b4f6a4e 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -275,7 +275,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
*
* PARAMETERS: *source_desc - Value to be stored
* *dest_desc - Where to store it. Must be an NS node
- * or an union acpi_operand_object of type
+ * or a union acpi_operand_object of type
* Reference;
* walk_state - Current walk state
*