Merge branch 'block'
authorJames Bottomley <James.Bottomley@suse.de>
Thu, 23 Dec 2010 05:29:40 +0000 (23:29 -0600)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 23 Dec 2010 05:29:40 +0000 (23:29 -0600)
commitce82ba80477c2cf3576f1e42c4c377e9995633a7
tree952eb80032c38e8a104015c3497bff2d09857af5
parent5f7bb3a439ce51ae8b92ca1dc93b91712224b69a
parent047b7bdab951b76d19b44388e35cf579ef91e448
Merge branch 'block'
15 files changed:
block/ioctl.c
drivers/md/md.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
fs/block_dev.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h
fs/ext3/super.c
fs/ext4/super.c
fs/ocfs2/cluster/heartbeat.c
fs/reiserfs/journal.c
fs/splice.c
include/linux/fs.h
include/scsi/scsi.h
kernel/power/swap.c