From: Olof Johansson <olof@lixom.net>
Date: Wed, 30 May 2012 23:06:39 +0000 (-0700)
Subject: Merge branch 'late/cleanup' into devel-late
X-Git-Tag: MMI-PSA29.97-13-9~16632^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d64f41d8d2dabf4d10a11f7a5d1ef8706969655f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'late/cleanup' into devel-late

* late/cleanup:
  ARM: S3C64XX: use timekeeping wrapper on cpuidle
  ARM: S3C64XX: declare the states with the new api on cpuidle
---

d64f41d8d2dabf4d10a11f7a5d1ef8706969655f