diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-09-14 20:19:06 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-09-14 20:19:06 +0300 |
| commit | aceda773606f2506a25b91aaafae87b2e4315834 (patch) | |
| tree | 6084163c1833f938c7e582ddf983c7748c038024 /net/unix/sysctl_net_unix.c | |
| parent | 0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (diff) | |
| parent | 5086c389cb897c7ad66c1cacd1abb5ffebaa74b2 (diff) | |
| parent | 8a3d271deb0cc9c2fc47317d8e431046382939c9 (diff) | |
Merge branches 'slab/cleanups' and 'slab/fixes' into for-linus