summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/tsx09-common.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 11:35:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-20 11:35:57 +0100
commit64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch)
tree0b8ed22d46d775f04d441e8c480c12ec297a005b /arch/arm/mach-orion5x/tsx09-common.c
parenttracing/function-graph-tracer: fix merge (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.xz
linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'arch/arm/mach-orion5x/tsx09-common.c')
0 files changed, 0 insertions, 0 deletions