summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2010-08-31 19:21:52 -0400
committerRobert Morris <[email protected]>2010-08-31 19:21:52 -0400
commit23c3e52c2fb5f1709bf5053a8e93161931b56bf9 (patch)
treecb51f605a35de8980efce5dcab3e5df9757c022a /README
parent3597d5dc704c192a85b9902f7264fe9025aad277 (diff)
parent5048762c7e27789a014cc1e74e1002e749c924ce (diff)
downloadxv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.tar.gz
xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.tar.bz2
xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.zip
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'README')
-rw-r--r--README3
1 files changed, 3 insertions, 0 deletions
diff --git a/README b/README
index 286d336..c46ec2a 100644
--- a/README
+++ b/README
@@ -20,6 +20,9 @@ The following people made contributions:
Cliff Frey (MP)
Xiao Yu (MP)
+In addition, we are grateful for the patches submitted by Greg Price,
+Yandong Mao, and Hitoshi Mitake.
+
The code in the files that constitute xv6 is
Copyright 2006-2007 Frans Kaashoek, Robert Morris, and Russ Cox.