Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
authorJens Axboe <jaxboe@fusionio.com>
Thu, 10 Mar 2011 07:58:35 +0000 (08:58 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 10 Mar 2011 07:58:35 +0000 (08:58 +0100)
commit4c63f5646e405b5010cc9499419060bf2e838f5b
treedf91ba315032c8ec4aafeb3ab96fdfa7c6c656e1
parentcafb0bfca1a73efd6d8a4a6a6a716e6134b96c24
parent69d60eb96ae8a73cf9b79cf28051caf973006011
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
35 files changed:
block/blk-core.c
block/blk-exec.c
block/blk-flush.c
block/blk-settings.c
block/blk-throttle.c
block/cfq-iosched.c
block/elevator.c
drivers/block/floppy.c
drivers/block/loop.c
drivers/block/pktcdvd.c
drivers/block/umem.c
drivers/ide/ide-cd.c
drivers/md/linear.c
drivers/md/md.c
drivers/md/multipath.c
drivers/md/raid0.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/message/i2o/i2o_block.c
drivers/s390/char/tape_block.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_transport_fc.c
fs/aio.c
fs/block_dev.c
fs/btrfs/extent_io.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c
fs/nilfs2/page.c
fs/nilfs2/page.h
include/linux/blkdev.h
include/linux/fs.h
mm/swapfile.c
mm/vmscan.c