summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-05 18:53:21 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-05 18:53:21 +0100
commit7a797cdcca2b3c0031e580203f18d6c9483aaec5 (patch)
treee35526b99793c08fd76c9a41e969c1c070adcc51 /Makefile
parentMerge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parenttracing: Fix trace_marker output (diff)
downloadlinux-7a797cdcca2b3c0031e580203f18d6c9483aaec5.tar.xz
linux-7a797cdcca2b3c0031e580203f18d6c9483aaec5.zip
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix trace_marker output tracing: Fix event format export tracing: Fix return value of tracing_stats_read()
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions