| commit | 239960bbf3c6ca09c3264e08020732a17cf5fa6f | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Thu Mar 02 20:48:20 2017 -0500 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Thu Mar 02 20:48:20 2017 -0500 |
| tree | 0e87b93d5902009d46d5faf25c3039ef8f668490 | |
| parent | 2335fc954ccf342e854379df1f6e81c3a98cf489 [diff] | |
| parent | bbe08c0a43e2c5ee3a00de68c0e867a08a9aa990 [diff] |
Merge remote-tracking branch 'origin' into merge-2 conflicts resolved as in -next