| commit | 5f1b5664d97842bc5dba40c2053bf95270b6ff7a | [log] [tgz] |
|---|---|---|
| author | David Sterba <dsterba@suse.com> | Fri Feb 26 15:38:28 2016 +0100 |
| committer | David Sterba <dsterba@suse.com> | Fri Feb 26 15:38:28 2016 +0100 |
| tree | 28d6a3aaf9c095ab2703634693615559329ee3b2 | |
| parent | 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 [diff] | |
| parent | 65bfa6580791f8c01fbc9cd8bd73d92aea53723f [diff] |
Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6 # Conflicts: # fs/btrfs/file.c