summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-02 22:37:35 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-02 22:37:35 +0100
commitfdfa66ab455c79d699833c43ac0e09900133fd7c (patch)
tree5ede20eaf13eab51c3a391e002a4e9988aa3e787 /fs
parentMerge branch 'tracing/ftrace' into tracing/core (diff)
parentMerge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentx86 mmiotrace: fix race with release_kmmio_fault_page() (diff)
downloadlinux-fdfa66ab455c79d699833c43ac0e09900133fd7c.tar.xz
linux-fdfa66ab455c79d699833c43ac0e09900133fd7c.zip
Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core