projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[platform/adaptation/renesas_rcar/renesas_kernel.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 occur
r
ed, add child to the old node. */
if (new_child)
add_child(old_node, new_child);
}
if (new_child)
add_child(old_node, new_child);
}