[PATCH] genirq: Fixup ARM devel merge