]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:37:14 +0000 (13:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:37:14 +0000 (13:37 +1100)
commitfd89282a9df52fb255124a55cc5bb355141c0bad
treee831fb341e0660e2eb49ee950f401a9773e51705
parentec142c3ccc9e1add7b344b500cd8f8e79f4ac9dd
parent454e2c4cbd66fc7af0e58642cb6a6f211a9b49f0
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/md/raid1.c
drivers/md/raid10.c
fs/btrfs/extent_io.c
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h
20 files changed:
block/blk-throttle.c
drivers/md/bcache/request.c
drivers/md/md.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/btrfs/check-integrity.c
fs/btrfs/compression.c
fs/btrfs/disk-io.c
fs/btrfs/extent_io.c
fs/btrfs/file-item.c
fs/btrfs/inode.c
fs/btrfs/scrub.c
fs/btrfs/volumes.c
fs/f2fs/data.c
fs/gfs2/lops.c
fs/gfs2/ops_fstype.c
fs/xfs/xfs_aops.c
fs/xfs/xfs_buf.c
include/trace/events/f2fs.h