Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc arch/arm/mach-omap2/id.c
Simple merge

diff --cc arch/arm/mach-omap2/irq.c
index fdc4303,b0790a9..6038a8c
--- 1/arch/arm/mach-omap2/irq.c
--- 2/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@@ -149,7 -148,9 +149,8 @@@ omap_alloc_gc(void __iomem *base, unsig
        ct->chip.irq_ack = omap_mask_ack_irq;
        ct->chip.irq_mask = irq_gc_mask_disable_reg;
        ct->chip.irq_unmask = irq_gc_unmask_enable_reg;
+       ct->chip.flags |= IRQCHIP_SKIP_SET_WAKE;
  
 -      ct->regs.ack = INTC_CONTROL;
        ct->regs.enable = INTC_MIR_CLEAR0;
        ct->regs.disable = INTC_MIR_SET0;
        irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge