| commit | fa695b01bceabc40be3267d309ca8a663de53d7a | [log] [tgz] |
|---|---|---|
| author | David Sterba <dsterba@suse.com> | Fri Feb 26 15:38:34 2016 +0100 |
| committer | David Sterba <dsterba@suse.com> | Fri Feb 26 15:38:34 2016 +0100 |
| tree | 017a66e7b0c2d928d3edc9531cf04bd3debf346a | |
| parent | f004fae0cfeb96d33240eb5471f14cb6fbbd4eea [diff] | |
| parent | f7e98a7fff8634ae655c666dc2c9fc55a48d0a73 [diff] |
Merge branch 'misc-4.6' into for-chris-4.6 # Conflicts: # fs/btrfs/file.c