]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36be505 aba607d)
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)
* '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


Trivial merge
Linux kernel for KaRo TX COM modules