diff options
author | Chris Mason <clm@fb.com> | 2015-03-25 20:25:02 +0100 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-03-25 20:25:02 +0100 |
commit | 9b305632cb220ffa495cbbefb313f3c34d4decc4 (patch) | |
tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/compression.c | |
parent | Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | btrfs: cleanup, use correct type in div_u64_rem (diff) | |
download | linux-9b305632cb220ffa495cbbefb313f3c34d4decc4.tar.xz linux-9b305632cb220ffa495cbbefb313f3c34d4decc4.zip |
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
Diffstat (limited to 'fs/btrfs/compression.c')
0 files changed, 0 insertions, 0 deletions