3 files changed, 24 insertions, 14 deletions

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index d5a79caec147..366ce9b87240 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -26,6 +26,7 @@ est	ESTeem Wireless Modems
 fsl     Freescale Semiconductor
 GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef     GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+hisilicon       Hisilicon Limited.
 hp      Hewlett Packard
 ibm     International Business Machines (IBM)
 idt     Integrated Device Technologies, Inc.
@@ -43,6 +44,7 @@ nxp	NXP Semiconductors
 onnn    ON Semiconductor Corp.
 picochip        Picochip Ltd
 powervr PowerVR (deprecated, use img)
+qca     Qualcomm Atheros, Inc.
 qcom    Qualcomm, Inc.
 ralink  Mediatek/Ralink Technology Corp.
 ramtron Ramtron International
diff --git a/MAINTAINERS b/MAINTAINERS
index 5d3facfd7899..f817ae196a8e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3622,11 +3622,9 @@ F:	drivers/isdn/gigaset/
 F:      include/uapi/linux/gigaset_dev.h
 
 GPIO SUBSYSTEM
-M:      Grant Likely <grant.likely@linaro.org>
 M:      Linus Walleij <linus.walleij@linaro.org>
 S:      Maintained
 L:      linux-gpio@vger.kernel.org
-T:      git git://git.secretlab.ca/git/linux-2.6.git
 F:      Documentation/gpio.txt
 F:      drivers/gpio/
 F:      include/linux/gpio*
@@ -4472,8 +4470,6 @@ F:	drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
-M:      Grant Likely <grant.likely@linaro.org>
-T:      git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
 S:      Maintained
 F:      Documentation/IRQ-domain.txt
 F:      include/linux/irqdomain.h
@@ -4990,7 +4986,7 @@ F:	arch/powerpc/platforms/44x/
 
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Unmaintained
+S:      Orphan
 F:      arch/powerpc/*/*virtex*
 F:      arch/powerpc/*/*/*virtex*
 
@@ -5886,7 +5882,7 @@ OMAP DEVICE TREE SUPPORT
 M:      Benoît Cousson <b-cousson@ti.com>
 M:      Tony Lindgren <tony@atomide.com>
 L:      linux-omap@vger.kernel.org
-L:      devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
+L:      devicetree@vger.kernel.org
 S:      Maintained
 F:      arch/arm/boot/dts/*omap*
 F:      arch/arm/boot/dts/*am3*
@@ -6050,17 +6046,28 @@ F:	drivers/i2c/busses/i2c-ocores.c
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:      Grant Likely <grant.likely@linaro.org>
 M:      Rob Herring <rob.herring@calxeda.com>
-L:      devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
+L:      devicetree@vger.kernel.org
 W:      http://fdt.secretlab.ca
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
-F:      Documentation/devicetree
-F:      drivers/of
+F:      drivers/of/
 F:      include/linux/of*.h
-F:      scripts/dtc
+F:      scripts/dtc/
 K:      of_get_property
 K:      of_match_table
 
+OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
+M:      Rob Herring <rob.herring@calxeda.com>
+M:      Pawel Moll <pawel.moll@arm.com>
+M:      Mark Rutland <mark.rutland@arm.com>
+M:      Stephen Warren <swarren@wwwdotorg.org>
+M:      Ian Campbell <ian.campbell@citrix.com>
+L:      devicetree@vger.kernel.org
+S:      Maintained
+F:      Documentation/devicetree/
+F:      arch/*/boot/dts/
+F:      include/dt-bindings/
+
 OPENRISC ARCHITECTURE
 M:      Jonas Bonn <jonas@southpole.se>
 W:      http://openrisc.net
@@ -7746,7 +7753,6 @@ F:	drivers/clk/spear/
 
 SPI SUBSYSTEM
 M:      Mark Brown <broonie@kernel.org>
-M:      Grant Likely <grant.likely@linaro.org>
 L:      linux-spi@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
 Q:      http://patchwork.kernel.org/project/spi-devel-general/list/
@@ -9288,7 +9294,7 @@ S:	Maintained
 F:      drivers/net/ethernet/xilinx/xilinx_axienet*
 
 XILINX SYSTEMACE DRIVER
-S:      Unmaintained
+S:      Orphan
 F:      drivers/block/xsysace.c
 
 XILINX UARTLITE SERIAL DRIVER
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;
                 }