Merge "ARM: GIC: fix irq_trigger return" into msm-3.4