tree 925d3102051db9664772911f29a59155825c671d
parent 28a33cbc24e4256c143dce96c7d93bf423229f92
parent b93d70aeb8f3b5ed2d74643f5009239a55634e1d
author Olof Johansson <olof@lixom.net> 1343422617 -0700
committer Olof Johansson <olof@lixom.net> 1343422617 -0700

Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into late2/pm

* 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm:
  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