From: Olof Johansson <olof@lixom.net>
Date: Sat, 19 May 2012 22:44:36 +0000 (-0700)
Subject: Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~2711^2~3^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b19861a2a550fac67c8bb92ba8045ede3b6c1286;p=firefly-linux-kernel-4.4.55.git

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
---

b19861a2a550fac67c8bb92ba8045ede3b6c1286