Merge remote-tracking branch 'irqdomain/irqdomain/next'

Conflicts:
	kernel/irq/irqdomain.c

diff --cc kernel/irq/generic-chip.c
Simple merge

diff --cc kernel/irq/irqdomain.c
index 9f76b7b5ec1b76b80ae3f1f19645509be9e643a4,13f265430c256b7326b4a08d4d232337099e919d..706724e9835dc07f72ca1bc21b1cba0bf86f5d65
--- 1/kernel/irq/irqdomain.c
--- 2/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@@ -659,8 -475,20 +475,8 @@@ unsigned int irq_create_of_mapping(stru
  
        domain = controller ? irq_find_host(controller) : irq_default_domain;
        if (!domain) {
-               pr_warning("no irq domain found for %s !\n",
-                          of_node_full_name(controller));
 -#ifdef CONFIG_MIPS
 -              /*
 -               * Workaround to avoid breaking interrupt controller drivers
 -               * that don't yet register an irq_domain.  This is temporary
 -               * code. ~~~gcl, Feb 24, 2012
 -               *
 -               * Scheduled for removal in Linux v3.6.  That should be enough
 -               * time.
 -               */
 -              if (intsize > 0)
 -                      return intspec[0];
 -#endif
+               pr_warn("no irq domain found for %s !\n",
+                       of_node_full_name(controller));
                return 0;
        }