• Linus Torvalds's avatar
    Merge tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · bfdf85df
    Linus Torvalds authored
    Pull arm-soc cpuidle enablement for OMAP from Olof Johansson:
     "Coupled cpuidle was meant to merge for 3.5 through Len Brown's tree,
      but didn't go in because the pull request ended up rejected.  So it
      just got merged, and we got this staged branch that enables the
      coupled cpuidle code on OMAP.
    
      With a stable git workflow from the other maintainer we could have
      staged this earlier, but that wasn't the case so we have had to merge
      it late.
    
      The alternative is to hold it off until 3.7 but given that the code is
      well-isolated to OMAP and they are eager to see it go in, I didn't
      push back hard in that direction."
    
    * tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: OMAP4: CPUidle: Open broadcast clock-event device.
      ARM: OMAP4: CPUidle: add synchronization for coupled idle states
      ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
      ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
    bfdf85df
timer.c 13.3 KB