| commit | 82df9c8bebeff610705f30315f3903cbcb3aa58b | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Thu Aug 07 14:07:57 2014 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Thu Aug 07 14:07:57 2014 -0400 |
| tree | 0d54eac4e7b46876111256caf169b22627441453 | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 [diff] | |
| parent | ccbf62d8a284cf181ac28c8e8407dd077d90dd4b [diff] |
Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next backmerge to avoid kernel/acct.c conflict