Jens Axboe ee9a3607fb Merge branch 'master' into for-2.6.35 ... Conflicts: fs/ext3/fsync.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-05-21 21:27:26 +02:00
..
blk-barrier.c
blk-cgroup.c	Merge branch 'master' into for-2.6.35	2010-05-21 21:27:26 +02:00
blk-cgroup.h
blk-core.c
blk-exec.c
blk-integrity.c
blk-ioc.c
blk-iopoll.c
blk-lib.c
blk-map.c
blk-merge.c
blk-settings.c
blk-softirq.c
blk-sysfs.c
blk-tag.c
blk-timeout.c
blk.h
bsg.c
cfq-iosched.c	Merge branch 'master' into for-2.6.35	2010-05-21 21:27:26 +02:00
compat_ioctl.c
deadline-iosched.c
elevator.c
genhd.c
ioctl.c
Kconfig
Kconfig.iosched
Makefile
noop-iosched.c
scsi_ioctl.c