From: Olof Johansson 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b19861a2a550fac67c8bb92ba8045ede3b6c1286;p=linux-beck.git Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/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