summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 19:31:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 19:31:35 +0200
commitaf5329cdf51cdd208a323e521faa46800a16d2ec (patch)
tree33eac56aac120778dc04207290ad539765ff5eb6 /block/blk-merge.c
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentgeneric-ipi: powerpc/generic-ipi tree build failure (diff)
downloadlinux-af5329cdf51cdd208a323e521faa46800a16d2ec.tar.xz
linux-af5329cdf51cdd208a323e521faa46800a16d2ec.zip
Merge branch 'core/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: powerpc/generic-ipi tree build failure stacktrace: fix build failure on sparc64 stacktrace: export save_stack_trace[_tsk] stacktrace: fix modular build, export print_stack_trace and save_stack_trace backtrace: replace timer with tasklet + completions stacktrace: add saved stack traces to backtrace self-test stacktrace: print_stack_trace() cleanup debugging: make stacktrace independent from DEBUG_KERNEL stacktrace: don't crash on invalid stack trace structs
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions