| commit | bbf65cf0b5b67843ca094df01019222b85af2183 | [log] [tgz] |
|---|---|---|
| author | Chris Mason <clm@fb.com> | Sat Oct 04 09:56:45 2014 -0700 |
| committer | Chris Mason <clm@fb.com> | Sat Oct 04 09:56:45 2014 -0700 |
| tree | 35e1a8c54876cc8a105a2ad0230526195d3cafbf | |
| parent | bf8e8ca6fd4ac6e8edc58b92cffb2ffd51933138 [diff] | |
| parent | fccb84c94a9755f48668e43d0a44d6ecc750900f [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