Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +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	cfq: Remove useless css reference get	2010-02-26 08:56:15 +01:00
blk-cgroup.h	cfq: Remove useless css reference get	2010-02-26 08:56:15 +01:00
blk-core.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
blk-exec.c	block: don't set REQ_NOMERGE unnecessarily	2009-04-28 07:37:33 +02:00
blk-integrity.c	block: fix improper kobject release in blk_integrity_unregister	2009-07-28 09:11:14 +02:00
blk-ioc.c	block: don't access jiffies when initialising io_context	2010-03-01 10:57:22 +01:00
blk-iopoll.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
blk-map.c	block: Use accessor functions for queue limits	2009-05-22 23:22:54 +02:00
blk-merge.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
blk-settings.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
blk-softirq.c
blk-sysfs.c	block: Added in stricter no merge semantics for block I/O	2010-01-29 09:04:08 +01:00
blk-tag.c	block: use proper BLK_RW_ASYNC in blk_queue_start_tag()	2009-10-06 20:19:02 +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: implement mixed merge of different failfast requests	2009-09-11 14:33:30 +02:00
bsg.c	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
cfq-iosched.c	cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds	2010-03-01 10:50:20 +01:00
compat_ioctl.c	block: Allow devices to indicate whether discarded blocks are zeroed	2009-12-03 09:24:48 +01:00
deadline-iosched.c	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
elevator.c	block: Added in stricter no merge semantics for block I/O	2010-01-29 09:04:08 +01:00
genhd.c	block: Fix discard alignment calculation and printing	2010-01-11 14:29:19 +01:00
ioctl.c	block: Allow devices to indicate whether discarded blocks are zeroed	2009-12-03 09:24:48 +01:00
Kconfig	blkio: Some debugging aids for CFQ	2009-12-03 19:28:52 +01:00
Kconfig.iosched	blkio: Allow CFQ group IO scheduling even when CFQ is a module	2009-12-04 16:38:14 +01:00
Makefile	blkio: Introduce blkio controller cgroup interface	2009-12-03 19:28:51 +01:00
noop-iosched.c
scsi_ioctl.c	block/scsi_ioctl.c: quiet sparse noise	2009-11-04 09:10:33 +01:00