diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-16 17:14:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-16 17:14:55 -0700 |
| commit | cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de (patch) | |
| tree | 8c466871a54837c7b64c0a10bf6afe498bdafddc /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | nilfs2: fix NULL pointer dereference in nilfs_load_super_block() (diff) | |
| download | wireguard-linux-cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de.tar.xz wireguard-linux-cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de.zip | |
Merge branch 'akpm' (more patches from Andrew)
Merge some more email patches from Andrew Morton:
"A couple of nilfs fixes"
* emailed from Andrew Morton <akpm@linux-foundation.org>:
nilfs2: fix NULL pointer dereference in nilfs_load_super_block()
nilfs2: clamp ns_r_segments_percentage to [1, 99]
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions