Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c
This commit is contained in:
Russell King
2008-10-09 21:33:02 +01:00
committed by Russell King
193 changed files with 15252 additions and 5410 deletions

View File

@@ -217,8 +217,7 @@ sic_handle_irq(unsigned int irq, struct irq_desc *desc)
irq += IRQ_SIC_START;
desc = irq_desc + irq;
desc_handle_irq(irq, desc);
generic_handle_irq(irq);
} while (status);
}