Ingo Molnar 30cd324e97 Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core ...

Conflicts:
	include/linux/ftrace.h

2008-12-19 09:42:40 +01:00

..

as-iosched.c

…

blk-barrier.c

block: internal dequeue shouldn't start timer

2008-12-03 12:41:26 +01:00

blk-core.c

Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core

2008-12-05 14:45:22 +01:00

blk-exec.c

…

blk-integrity.c

…

blk-ioc.c

…

blk-map.c

When block layer fails to map iov, it calls bio_unmap_user to undo

2008-12-03 12:41:20 +01:00

blk-merge.c

…

blk-settings.c

block: fix setting of max_segment_size and seg_boundary mask

2008-12-03 12:55:55 +01:00

blk-softirq.c

…

blk-sysfs.c

…

blk-tag.c

…

blk-timeout.c

Block: use round_jiffies_up()

2008-11-06 08:42:49 +01:00

blk.h

…

blktrace.c

blktrace: port to tracepoints

2008-11-26 12:13:34 +01:00

bsg.c

Enforce a minimum SG_IO timeout

2008-12-05 14:49:18 -08:00

cfq-iosched.c

…

cmd-filter.c

…

compat_ioctl.c

[PATCH 1/2] kill FMODE_NDELAY_NOW

2008-12-04 04:22:57 -05:00

deadline-iosched.c

…

elevator.c

Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core

2008-12-05 14:45:22 +01:00

genhd.c

block: set disk->node_id before it's being used

2008-12-03 12:41:20 +01:00

ioctl.c

block: make add_partition() return pointer to hd_struct

2008-11-18 15:08:56 +01:00

Kconfig

blktrace: port to tracepoints

2008-11-26 12:13:34 +01:00

Kconfig.iosched

…

Makefile

…

noop-iosched.c

…

scsi_ioctl.c

Enforce a minimum SG_IO timeout

2008-12-05 14:49:18 -08:00