]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 826148f 30ecd3a)
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)
commit0eb6884fc2c3815c62329ea6c2bccf58ab791764
tree0d49c3e4d8f64a4cc0d3f42f37430fc60007e28btree | snapshot
parent826148fd23b3246e99ef6f2854da29f51bf6c201commit | diff
parent30ecd3a5c2ac6f45b52762f69e8220725818ec7dcommit | 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.