summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-03 06:25:38 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-03 06:25:38 +0100
commitdc573f9b20c8710105ac35c08ed0fe1da5160ecd (patch)
tree24db0a0f6364b78f9c74e62541d26155e785b8f9 /arch/ia64
parenttrace_sched_wakeup: Remove unused variable (diff)
parentkmemtrace: fix printk formats, fix (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
downloadlinux-dc573f9b20c8710105ac35c08ed0fe1da5160ecd.tar.xz
linux-dc573f9b20c8710105ac35c08ed0fe1da5160ecd.zip
Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core