Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits) tracing, net: fix net tree and tracing tree merge interaction tracing, powerpc: fix powerpc tree and tracing tree interaction ring-buffer: do not remove reader page from list on ring buffer free function-graph: allow unregistering twice trace: make argument 'mem' of trace_seq_putmem() const tracing: add missing 'extern' keywords to trace_output.h tracing: provide trace_seq_reserve() blktrace: print out BLK_TN_MESSAGE properly blktrace: extract duplidate code blktrace: fix memory leak when freeing struct blk_io_trace blktrace: fix blk_probes_ref chaos blktrace: make classic output more classic blktrace: fix off-by-one bug blktrace: fix the original blktrace blktrace: fix a race when creating blk_tree_root in debugfs blktrace: fix timestamp in binary output tracing, Text Edit Lock: cleanup tracing: filter fix for TRACE_EVENT_FORMAT events ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release() x86: kretprobe-booster interrupt emulation code fix ... Fix up trivial conflicts in arch/parisc/include/asm/ftrace.h include/linux/memory.h kernel/extable.c kernel/module.c		2009-04-05 11:04:19 -07:00
..
as-iosched.c
blk-barrier.c
blk-core.c	block: WARN in __blk_put_request() for potential bio leak	2009-03-26 11:01:23 +01:00
blk-exec.c
blk-integrity.c
blk-ioc.c
blk-map.c
blk-merge.c	block: WARN in __blk_put_request() for potential bio leak	2009-03-26 11:01:23 +01:00
blk-settings.c
blk-softirq.c	generic-ipi: remove CSD_FLAG_WAIT	2009-02-25 14:13:44 +01:00
blk-sysfs.c
blk-tag.c
blk-timeout.c	block: fix deadlock in blk_abort_queue() for drivers that readd to timeout list	2009-02-18 10:34:16 +01:00
blk.h	cpumask: use topology_core_cpumask/topology_thread_cpumask instead of cpu_core_map/cpu_sibling_map	2009-03-13 14:49:46 +10:30
bsg.c	bsg: Remove bogus check against request_queue->max_sectors	2009-03-26 11:01:25 +01:00
cfq-iosched.c
cmd-filter.c	[SCSI] Make scsi.h independent of the rest of the scsi includes	2009-03-12 12:58:13 -05:00
compat_ioctl.c
deadline-iosched.c
elevator.c
genhd.c	block: add documentation for register_blkdev()	2009-02-26 10:45:48 +01:00
ioctl.c
Kconfig	tracing/blktrace: move the tracing file to kernel/trace	2009-02-09 10:51:02 +01:00
Kconfig.iosched
Makefile	tracing/blktrace: move the tracing file to kernel/trace	2009-02-09 10:51:02 +01:00
noop-iosched.c
scsi_ioctl.c	block: WARN in __blk_put_request() for potential bio leak	2009-03-26 11:01:23 +01:00