]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8734b27 cdc58a5)
Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorChris Mason <clm@fb.com>
Sat, 4 Oct 2014 16:56:45 +0000 (09:56 -0700)
committerChris Mason <clm@fb.com>
Sat, 4 Oct 2014 16:56:45 +0000 (09:56 -0700)
commit5e2c7bceda9e2285a6713ec229cdd32fadc690d6
tree35e1a8c54876cc8a105a2ad0230526195d3cafbftree | snapshot
parent8734b27d755d7610fd1d32e5b7c2c9b631daaeadcommit | diff
parentcdc58a54537b89a327a6916eb7a9f35320aaa786commit | diff
Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus

Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/extent_io.c
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/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.h diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/relocation.c diff1 | diff2 | blob | history
fs/btrfs/send.c diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.