Merge branch 'late/cleanup' into devel-late
authorOlof Johansson <olof@lixom.net>
Wed, 30 May 2012 23:06:39 +0000 (16:06 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 30 May 2012 23:06:39 +0000 (16:06 -0700)
commitd64f41d8d2dabf4d10a11f7a5d1ef8706969655f
treee2cbd1e386b702b227bc029d3614ee2da03964bc
parentaf56e0aa35f3ae2a4c1a6d1000702df1dd78cb76
parentb19861a2a550fac67c8bb92ba8045ede3b6c1286
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