diff options
| author |   Pekka Enberg <penberg@kernel.org> | 2011-05-23 19:50:39 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-05-23 19:50:39 +0300 |
| commit | bfb91fb650e988c3c347e50fc75fedb7d4f0c018 (patch) | |
| tree | 0e8d89e0ceffb9001da2082998222da8b39185c1 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (diff) | |
| parent | slub: Deal with hyperthetical case of PAGE_SIZE > 2M (diff) | |
| download | wireguard-linux-bfb91fb650e988c3c347e50fc75fedb7d4f0c018.tar.xz wireguard-linux-bfb91fb650e988c3c347e50fc75fedb7d4f0c018.zip | |
Merge branch 'slab/next' into for-linus
Conflicts:
mm/slub.c
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions