Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
authorJens Axboe <jaxboe@fusionio.com>
Tue, 19 Oct 2010 07:13:04 +0000 (09:13 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 19 Oct 2010 07:13:04 +0000 (09:13 +0200)
commitfa251f89903d73989e2f63e13d0eaed1e07ce0da
tree3f7fe779941e3b6d67754dd7c44a32f48ea47c74
parentdd3932eddf428571762596e17b65f5dc92ca361b
parentcd07202cc8262e1669edff0d97715f3dd9260917
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
19 files changed:
Documentation/lguest/lguest.c
block/blk-core.c
block/blk.h
block/elevator.c
drivers/block/pktcdvd.c
drivers/block/virtio_blk.c
drivers/block/xen-blkfront.c
drivers/md/md.c
drivers/md/md.h
drivers/md/raid1.c
drivers/scsi/sd.c
fs/gfs2/log.c
fs/nilfs2/the_nilfs.c
fs/xfs/linux-2.6/xfs_buf.c
fs/xfs/linux-2.6/xfs_buf.h
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/xfs_log.c
include/linux/fs.h
mm/swapfile.c