]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ab45914 391b7a7)
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 01:32:27 +0000 (12:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 01:32:27 +0000 (12:32 +1100)
commit600085e3608892c6e85f49c7e573ca53b4c174c0
treedfb8e34c84224a830fc294f7396cd40b4b790e45tree | snapshot
parentab4591440bdd6b8b967407eb7d8307d4d14d656bcommit | diff
parent391b7a7bfb527de31fee0942a9e45d9e1e9cd190commit | diff
Merge remote-tracking branch 'block/for-next'

Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/f2fs/data.c
fs/f2fs/segment.c
fs/logfs/dev_bdev.c
include/trace/events/f2fs.h
14 files changed:
block/blk-mq.c diff1 | diff2 | blob | history
block/blk-throttle.c diff1 | diff2 | blob | history
drivers/block/xen-blkfront.c diff1 | diff2 | blob | history
drivers/md/md.c diff1 | diff2 | blob | history
drivers/md/raid5.c diff1 | diff2 | blob | history
drivers/s390/block/dasd_eckd.c diff1 | diff2 | blob | history
drivers/scsi/sd.c diff1 | diff2 | blob | history
drivers/staging/zram/zram_drv.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/f2fs/data.c diff1 | diff2 | blob | history
fs/gfs2/lops.c diff1 | diff2 | blob | history
fs/gfs2/ops_fstype.c diff1 | diff2 | blob | history
fs/xfs/xfs_buf.c diff1 | diff2 | blob | history
include/trace/events/f2fs.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules