Merge branch 'merge' into next

Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/of.h b/include/linux/of.h
index a093b2fe5df..681a6c88010 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -344,6 +344,13 @@ static inline bool of_have_populated_dt(void)
 #define for_each_child_of_node(parent, child) \
 	while (0)
 
+static inline struct device_node *of_get_child_by_name(
+					const struct device_node *node,
+					const char *name)
+{
+	return NULL;
+}
+
 static inline int of_get_child_count(const struct device_node *np)
 {
 	return 0;