Merge tag 'v3.16-rc6' into next

[sfrench/cifs-2.6.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index c322dcfb926d3c2d850f22af9b3c287e086bd9c2..28ee1514b9deec0d19bca725b74ca6934d719f24 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -9,6 +9,10 @@
                        Linus
 ----------
 
+M: Matt Mackal
+E: mpm@selenic.com
+D: SLOB slab allocator
+
 N: Matti Aarnio
 E: mea@nic.funet.fi
 D: Alpha systems hacking, IPv6 and other network related stuff