Subject: linux-next: manual merge of the irqflags tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 7 Oct 2010 15:08:35 +1100

Hi David,

Today's linux-next merge of the irqflags tree got a conflict in
arch/mips/kernel/irq-gic.c between commit
863cb9bad8f992a9c171e90552045eac77808e84 ("MIPS: GIC: Remove dependencies
from Malta files") from Linus' tree and commit
9cbb8e371af264699522030ec637c55a58765859 ("MIPS: Add missing #inclusions
of <linux/irq.h>") from the irqflags tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/mips/kernel/irq-gic.c
index 82ba9f6,e0ff05d..0000000
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
@@@ -7,7 -8,7 +8,6 @@@
  #include <asm/io.h>
  #include <asm/gic.h>
  #include <asm/gcmpregs.h>
- #include <asm/irq.h>
 -#include <asm/mips-boards/maltaint.h>
  #include <linux/hardirq.h>
  #include <asm-generic/bitops/find.h>