projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix common misspellings
[linux-flexiantxendom0-3.2.10.git]
/
scripts
/
dtc
/
livetree.c
diff --git
a/scripts/dtc/livetree.c
b/scripts/dtc/livetree.c
index
c9209d5
..
26d0e1e
100644
(file)
--- a/
scripts/dtc/livetree.c
+++ b/
scripts/dtc/livetree.c
@@
-155,7
+155,7
@@
struct node *merge_nodes(struct node *old_node, struct node *new_node)
}
}
- /* if no collision occured, add child to the old node. */
+ /* if no collision occurred, add child to the old node. */
if (new_child)
add_child(old_node, new_child);
}