summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/time-armada-370-xp.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-03 07:52:21 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-03 07:52:21 +0200
commit6c09f6d830d03b78717403e7b42838a2ee2987ae (patch)
tree6436ab6a237578406e004c891e134afd266fb95d /drivers/clocksource/time-armada-370-xp.c
parentMerge branch 'fortglx/3.12/time' into fortglx/3.13/time (diff)
parentLinux 3.12-rc3 (diff)
downloadlinux-6c09f6d830d03b78717403e7b42838a2ee2987ae.tar.xz
linux-6c09f6d830d03b78717403e7b42838a2ee2987ae.zip
Merge tag 'v3.12-rc3' into timers/core
Merge Linux 3.12-rc3 - refresh the tree with the latest fixes before merging new bits. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource/time-armada-370-xp.c')
0 files changed, 0 insertions, 0 deletions