Merge branch 'linux-2.6' into powerpc-next

2008-05-16 23:13:42 +10:00
parent 541b2755c2 f26a398891
commit fcff474ea5
503 changed files with 16310 additions and 4544 deletions
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -65,6 +65,9 @@ struct property *of_find_property(const struct device_node *np,
 {
 	struct property *pp;

+	if (!np)
+		return NULL;
+
 	read_lock(&devtree_lock);
 	for (pp = np->properties; pp != 0; pp = pp->next) {
 		if (of_prop_cmp(pp->name, name) == 0) {