Jens Axboe b4b7a4ef09 Merge branch 'master' into for-linus ... Conflicts: block/Kconfig Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-03-19 08:05:10 +01:00
..
blk-barrier.c	block: Honor the gfp_mask for alloc_page() in blkdev_issue_discard()	2009-12-29 08:53:54 +01:00
blk-cgroup.c	cgroups: blkio subsystem as module	2010-03-12 15:52:36 -08:00
blk-cgroup.h	cgroups: blkio subsystem as module	2010-03-12 15:52:36 -08:00
blk-core.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
blk-exec.c
blk-integrity.c	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
blk-ioc.c	block: don't access jiffies when initialising io_context	2010-03-01 10:57:22 +01:00
blk-iopoll.c
blk-map.c
blk-merge.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
blk-settings.c	block: Fix overrun in lcm() and move it to lib	2010-03-15 12:47:59 +01:00
blk-softirq.c
blk-sysfs.c	Merge branch 'master' into for-linus	2010-03-19 08:05:10 +01:00
blk-tag.c
blk-timeout.c
blk.h
bsg.c	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
cfq-iosched.c	cfq-iosched: fix a kbuild regression	2010-03-19 08:03:04 +01:00
compat_ioctl.c
deadline-iosched.c
elevator.c	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
genhd.c	block: Fix discard alignment calculation and printing	2010-01-11 14:29:19 +01:00
ioctl.c
Kconfig	block: make CONFIG_BLK_CGROUP visible	2010-03-16 08:57:15 +01:00
Kconfig.iosched	cgroups: blkio subsystem as module	2010-03-12 15:52:36 -08:00
Makefile
noop-iosched.c
scsi_ioctl.c