Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 22:44:36 +0000 (15:44 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 22:44:36 +0000 (15:44 -0700)
commitb19861a2a550fac67c8bb92ba8045ede3b6c1286
treebd843281a854f69c677cb9f8af010de7cd7578d8
parent36be50515fe2aef61533b516fa2576a2c7fe7664
parentaba607d63c71ef9b185fc7cb9637ab70a2d88491
Merge branch 'next/cleanup-samsung-2' of git://git./linux/kernel/git/kgene/linux-samsung into late/cleanup

* 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C64XX: use timekeeping wrapper on cpuidle
  ARM: S3C64XX: declare the states with the new api on cpuidle