]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: efb8c61 03f7c79)
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)
commit8585ee13e32dfc592d32e9456bf1674b1959e48a
tree0d49c3e4d8f64a4cc0d3f42f37430fc60007e28btree | snapshot
parentefb8c61d4e21f78abc8141a7928d6fceb3b4a51fcommit | diff
parent03f7c794f54058a5997e692b46f54a5a621bfbedcommit | diff
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.