diff --git a/[refs] b/[refs] index befb7b27e02c..6163b07f43c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dfb059b9438633b0546c5431538a47f6ed99028 +refs/heads/master: 1de8ad43d0048963d0a0adf14bb046340426b1e4 diff --git a/trunk/CREDITS b/trunk/CREDITS index 07e32a87d956..44fce988eaac 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -688,10 +688,13 @@ S: Oxfordshire, UK. N: Kees Cook E: kees@outflux.net -W: http://outflux.net/ -P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30 1975 1FFF 4BA9 1706 3E6D -D: Minor updates to SCSI types, added /proc/pid/maps protection +E: kees@ubuntu.com +E: keescook@chromium.org +W: http://outflux.net/blog/ +P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E 6E13 8972 F4DF DC6D C026 +D: Various security things, bug fixes, and documentation. S: (ask for current address) +S: Portland, Oregon S: USA N: Robin Cornelius