Merge 3.11-rc3 into char-misc-next.

This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index a3c1c5aae6a9..1264923ade0f 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -345,6 +345,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
         if (r && irq) {
                 const char *name = NULL;
 
+                memset(r, 0, sizeof(*r));
                 /*
                  * Get optional "interrupts-names" property to add a name
                  * to the resource.
@@ -482,8 +483,9 @@ void __init of_irq_init(const struct of_device_id *matches)
                 }
 
                 /* Get the next pending parent that might have children */
-                desc = list_first_entry(&intc_parent_list, typeof(*desc), list);
-                if (list_empty(&intc_parent_list) || !desc) {
+                desc = list_first_entry_or_null(&intc_parent_list,
+                                                typeof(*desc), list);
+                if (!desc) {
                         pr_err("of_irq_init: children remain, but no parents\n");
                         break;
                 }