Ingo Molnar 72c26c9a26 Merge branch 'linus' into tracing/blktrace ...

Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-02-19 09:00:35 +01:00

..

as-iosched.c

block: get rid of elevator_t typedef

2008-12-29 08:29:50 +01:00

blk-barrier.c

block: Fix documentation for blkdev_issue_flush()

2009-01-30 12:34:37 +01:00

blk-core.c

block: fix oops in blk_queue_io_stat()

2009-02-02 08:42:32 +01:00

blk-exec.c

Add some block/ source files to the kernel-api docbook. Fix kernel-doc notation in them as needed. Fix changed function parameter names. Fix typos/spellos. In comments, change REQ_SPECIAL to REQ_TYPE_SPECIAL and REQ_BLOCK_PC to REQ_TYPE_BLOCK_PC.

2008-10-09 08:56:03 +02:00

blk-integrity.c

block: Allow empty integrity profile

2009-01-30 12:34:36 +01:00

blk-ioc.c

…

blk-map.c

[SCSI] block: make blk_rq_map_user take a NULL user-space buffer for WRITE

2009-01-02 11:10:35 -06:00

blk-merge.c

block: remove unused ll_new_mergeable()

2008-11-06 08:41:55 +01:00

blk-settings.c

block: use min_not_zero in blk_queue_stack_limits

2008-12-29 08:29:51 +01:00

blk-softirq.c

block: make blk_softirq_init() static

2008-12-29 08:29:51 +01:00

blk-sysfs.c

block: add sysfs file for controlling io stats accounting

2009-01-30 12:34:38 +01:00

blk-tag.c

block/blk-tag.c: cleanup kernel-doc

2008-12-29 08:28:43 +01:00

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

block: fix oops in blk_queue_io_stat()

2009-02-02 08:42:32 +01:00

bsg.c

bsg: Fix sense buffer bug in SG_IO

2009-02-18 10:32:00 +01:00

cfq-iosched.c

cfq-iosched: Allow RT requests to pre-empt ongoing BE timeslice

2009-01-30 12:47:33 +01:00

cmd-filter.c

[PATCH] introduce fmode_t, do annotations

2008-10-21 07:47:06 -04:00

compat_ioctl.c

block: don't take lock on changing ra_pages

2008-12-29 08:28:43 +01:00

deadline-iosched.c

block: get rid of elevator_t typedef

2008-12-29 08:29:50 +01:00

elevator.c

block: get rid of elevator_t typedef

2008-12-29 08:29:50 +01:00

genhd.c

block: fix booting from partitioned md array

2009-02-18 10:33:59 +01:00

ioctl.c

block: don't take lock on changing ra_pages

2008-12-29 08:28:43 +01:00

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

block: get rid of elevator_t typedef

2008-12-29 08:29:50 +01:00

scsi_ioctl.c

scsi-ioctl: use clock_t <> jiffies

2008-12-29 08:28:42 +01:00