aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-10 22:54:23 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-10 22:54:23 +0100
commit4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (patch)
tree88f8f450ef038c36f3620c79635b2e22e3b0528a /fs
parenttrace_clock: fix preemption bug (diff)
parentx86: expand irq-off region in text_poke() (diff)
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq (diff)
downloadlinux-dev-4dd163a0512eb91bbcf4e66d2f65b8e4042561b3.tar.xz
linux-dev-4dd163a0512eb91bbcf4e66d2f65b8e4042561b3.zip
Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core