Jens Axboe e4b636366c Merge branch 'master' into for-2.6.31 ...

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2009-05-22 20:25:34 +02:00

..

as-iosched.c

block: convert to pos and nr_sectors accessors

2009-05-11 09:50:54 +02:00

blk-barrier.c

block: change the tag sync vs async restriction logic

2009-05-20 08:54:31 +02:00

blk-core.c

Merge branch 'master' into for-2.6.31

2009-05-22 20:25:34 +02:00

blk-exec.c

block: don't set REQ_NOMERGE unnecessarily

2009-04-28 07:37:33 +02:00

blk-integrity.c

block: Allow empty integrity profile

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

blk-ioc.c

cfq-iosched: fix RCU race in the cfq io_context destructor handling

2008-05-07 09:28:57 +02:00

blk-map.c

block: Un-export blk_rq_append_bio

2009-05-19 12:14:56 +02:00

blk-merge.c

block: hide request sector and data_len

2009-05-11 09:50:55 +02:00

blk-settings.c

block: fix queue bounce limit setting

2009-04-22 08:35:09 +02:00

blk-softirq.c

generic-ipi: remove CSD_FLAG_WAIT

2009-02-25 14:13:44 +01:00

blk-sysfs.c

block: simplify I/O stat accounting

2009-04-24 08:54:21 +02:00

blk-tag.c

block: change the tag sync vs async restriction logic

2009-05-20 08:54:31 +02:00

blk-timeout.c

block: clean up misc stuff after block layer timeout conversion

2009-04-28 07:37:34 +02:00

blk.h

block: Un-export blk_rq_append_bio

2009-05-19 12:14:56 +02:00

bsg.c

block: add rq->resid_len

2009-05-11 09:50:53 +02:00

cfq-iosched.c

block: drop request->hard_* and *nr_sectors

2009-05-11 09:50:54 +02:00

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

block: don't take lock on changing ra_pages

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

deadline-iosched.c

block: convert to pos and nr_sectors accessors

2009-05-11 09:50:54 +02:00

elevator.c

block: change the tag sync vs async restriction logic

2009-05-20 08:54:31 +02:00

genhd.c

block: include empty disks in /proc/diskstats

2009-04-22 08:35:10 +02:00

ioctl.c

block: Remove code handling bio_alloc failure with __GFP_WAIT

2009-04-15 12:10:12 +02:00

Kconfig

block: enable by default support for large devices and files on 32-bit archs

2009-04-28 07:37:33 +02:00

Kconfig.iosched

update I/O sched Kconfig help texts - CFQ is now default, not AS.

2007-02-17 20:08:22 +01:00

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

block: add rq->resid_len

2009-05-11 09:50:53 +02:00