]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup' into for-next
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 17:39:42 +0000 (10:39 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 17:40:58 +0000 (10:40 -0700)
commit204d25f93522a1e7f0d98c05b1793370e8560268
tree383c236c611ac685a39976d0aa7bd5d7ac65ec96
parent2ffd0370ea07b8bca14407c78c95cc11b0ae5df7
parentae2fe0c0cad76973314955f68a26229b621bc3a2
Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: ks8695: convert to generic time and clocksource
  ARM: ks8695: delete resume hook from timer
  ARM: ks8695: use [readl|writel]_relaxed()
  ARM: ks8695: merge the timer header into the timer driver
arch/arm/Kconfig
arch/arm/arm-soc-for-next-contents.txt