]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorChris Mason <clm@fb.com>
Wed, 25 Mar 2015 19:25:02 +0000 (12:25 -0700)
committerChris Mason <clm@fb.com>
Wed, 25 Mar 2015 19:25:02 +0000 (12:25 -0700)
commit8481d70dd2e7b970ba6bd2ee5c6dd2980b698a66
tree0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b
parent0eb6884fc2c3815c62329ea6c2bccf58ab791764
parenta0d4037e548d3056f9e31ee5bdd66c398375c8b8
Merge branch 'cleanup/divs' 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/volumes.c