Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-shmobile/board-kota2.c between commit 1b6cec8a6910 ("ARM:
mach-shmobile: Kota2 PINT fix") from Linus' tree and commit a83d8e27d2f6
("ARM: shmobile: convert smp platforms to gic_handle_irq()") from the arm
tree.

Just context changes.  I fixed it up (see below) and can carry the change
as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/board-kota2.c
index f44150b,1b4439d..0000000

--- a/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c

@@@ -549,9 -447,8 +549,9 @@@ struct sys_timer kota2_timer = 
  
  MACHINE_START(KOTA2, "kota2")
  	.map_io		= kota2_map_io,
 -	.init_irq	= kota2_init_irq,
 +	.nr_irqs	= NR_IRQS_LEGACY,
 +	.init_irq	= sh73a0_init_irq,
- 	.handle_irq	= shmobile_handle_irq_gic,
+ 	.handle_irq	= gic_handle_irq,
  	.init_machine	= kota2_init,
  	.timer		= &kota2_timer,
  MACHINE_END