| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb | [log] [tgz] |
|---|---|---|
| author | Chris Mason <clm@fb.com> | Wed Mar 25 10:52:48 2015 -0700 |
| committer | Chris Mason <clm@fb.com> | Wed Mar 25 10:52:48 2015 -0700 |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b | |
| parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b [diff] | |
| parent | a4f3d2c4efe2628329249b64fd5799468e025b9d [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