diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-22 13:38:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-22 13:38:06 +0100 |
| commit | 0dfca419b5448082b7e2f7db4de2e4643dfbfe35 (patch) | |
| tree | 4b37c323cbf06bafaea978226658bca612f27711 /include/linux/perf_event.h | |
| parent | c16c4c4b12cf78fb7e947f4a21b2e4b97fb6280c (diff) | |
| parent | 342896a5c565e38dfb87954f362735f03ae1efb0 (diff) | |
Merge tag 'renesas-clocksource-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
From Simon Horman <horms@verge.net.au>:
Renesas ARM and SH based SoC clocksource update for v3.10
I has been agreed by Paul Mundt and myself, that it would be best to take
these changes through the renesas tree and in turn the arm-soc tree.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-clocksource-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
clocksource: sh_mtu2: Set initcall level to subsys
clocksource: em_sti: Set initcall level to subsys
clocksource: sh_tmu: Set initcall level to subsys
clocksource: sh_cmt: Set initcall level to subsys
clocksource: sh_cmt: Add CMT register layout comment
clocksource: sh_cmt: Add control register callbacks
clocksource: sh_cmt: CMCNT and CMCOR register access update
clocksource: sh_cmt: CMSTR and CMCSR register access update
clocksource: sh_cmt: Consolidate platform_set_drvdata() call
clocksource: sh_cmt: Introduce per-register functions
clocksource: sh_cmt: Initialize 'max_match_value' and 'lock' in sh_cmt_setup()
clocksource: sh_cmt: Take care of clk_put() when setup_irq() fails
Diffstat (limited to 'include/linux/perf_event.h')
0 files changed, 0 insertions, 0 deletions