aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-04 00:17:42 -0400
committerLen Brown <len.brown@intel.com>2005-08-04 00:17:42 -0400
commitbd6dbdf3c7b9784fbf5d8500e427a954e27a976a (patch)
tree9e626720517f1a0e92561b191e20640ed0af6362 /drivers/acpi
parentaefdcfa6c243702f1d35d23515d0e5eeca225c97 (diff)
parentd4ab025b73a2d10548e17765eb76f3b7351dc611 (diff)
When a merge does not work automatically, git prevents
commit from running until a change has been made in the destination. In this instance the desired result was to choose the destination version of the file and ignore the source version, but git would not allow that. Here I added a blank line to let git commit think I resolved a merge conflict.
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/dispatcher/dswload.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index d2c603f54fd..9100c0bda47 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -983,6 +983,7 @@ acpi_ds_load2_end_op (
ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
walk_state, &(new_node));
if (ACPI_SUCCESS (status)) {
+
/*
* Make sure that what we found is indeed a method
* We didn't search for a method on purpose, to see if the name