]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3ec69a 94f53f1)
Merge branch 'next/soc' into for-next
authorKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:42:47 +0000 (15:42 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:43:07 +0000 (15:43 -0700)
commit66173665367f3b329e47566e82bf01607aa32dc4
tree86fc2473154325ae41fa6a7889373ed5fdee4665tree | snapshot
parentd3ec69a9a56bc17f6dda4ff3ad85c60e5050ac14commit | diff
parent94f53f1f0845a0c7a9cdd0107939f5876bf9e428commit | diff
Merge branch 'next/soc' into for-next

* next/soc:
  ARM: OMAP2+: Fix build error for realtime counter init if not enabled
  ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register
  ARM: OMAP5: id: Remove ES1.0 support
  ARM: OMAP2+: DRA7: realtime_counter: Add ratio registers for 20MHZ sys-clk frequency

Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/arm-soc-for-next-contents.txt diff1 | | blob | history
arch/arm/mach-omap2/timer.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules