projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9deed22 a4f3d2c)
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChris Mason <clm@fb.com>
Wed, 25 Mar 2015 17:52:48 +0000 (10:52 -0700)
committerChris Mason <clm@fb.com>
Wed, 25 Mar 2015 17:52:48 +0000 (10:52 -0700)
commitfc4c3c872f44bf425963feba57eb9c3f8ac2d7eb
tree0d49c3e4d8f64a4cc0d3f42f37430fc60007e28btree | snapshot
parent9deed229fa8a83bb5cd713b2d2a8e5c022a4b45bcommit | diff
parenta4f3d2c4efe2628329249b64fd5799468e025b9dcommit | diff
Merge branch 'cleanups-post-3.19' of git://git./linux/kernel/git/kdave/linux into for-linus-4.1

Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
14 files changed:
fs/btrfs/check-integrity.c diff1 | diff2 | blob | history
fs/btrfs/compression.c diff1 | diff2 | blob | history
fs/btrfs/ctree.c diff1 | diff2 | blob | history
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/file-item.c diff1 | diff2 | blob | history
fs/btrfs/file.c diff1 | diff2 | blob | history
fs/btrfs/qgroup.c diff1 | diff2 | blob | history
fs/btrfs/raid56.c diff1 | diff2 | blob | history
fs/btrfs/scrub.c diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
fs/btrfs/tree-log.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.