summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/time.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-19 09:27:32 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-09-19 09:28:41 (GMT)
commit929bf0d0156562ce631728b6fa53d68004d456d2 (patch)
tree739063990a8077b29ef97e69d73bce94573daae4 /arch/arm/kernel/time.c
parentdef0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff)
parent202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff)
downloadlinux-fsl-qoriq-929bf0d0156562ce631728b6fa53d68004d456d2.tar.xz
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/kernel/time.c')
0 files changed, 0 insertions, 0 deletions