diff options
| author | Daniel Rosenberg <drosen@google.com> | 2015-07-21 15:17:26 -0700 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-03-11 16:09:01 +0100 |
| commit | 46d3e274ee669a0bc574dcaff2da19a876b2423f (patch) | |
| tree | 12c9462caca726d9d46fba654d593dfa236210d8 /net/dccp | |
| parent | d67359715ec7e41398e64624ddeb1ba1bb0061de (diff) | |
| download | kernel_samsung_espresso10-46d3e274ee669a0bc574dcaff2da19a876b2423f.zip kernel_samsung_espresso10-46d3e274ee669a0bc574dcaff2da19a876b2423f.tar.gz kernel_samsung_espresso10-46d3e274ee669a0bc574dcaff2da19a876b2423f.tar.bz2 | |
Fix incorrect conflict resolution in "vfs: Add setns support for the mount namespace"
Diffstat (limited to 'net/dccp')
0 files changed, 0 insertions, 0 deletions