| commit | 680834ca0ad4e9827048d4bda1e38db69c3dd1e4 | [log] [tgz] |
|---|---|---|
| author | David Sterba <dsterba@suse.com> | Mon May 16 15:46:29 2016 +0200 |
| committer | David Sterba <dsterba@suse.com> | Mon May 16 15:46:29 2016 +0200 |
| tree | 595935ba3afc91dce9be83ca65932f3cf1379436 | |
| parent | 36fac9e9ff20f71fe7ba21978f5949a38d390a4b [diff] | |
| parent | 14b05c5106312744badb463e7fb9a78811e44fc0 [diff] |
Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516 # Conflicts: # include/uapi/linux/btrfs.h