Merge pull request #40 from lowRISC/update-lic

update license and move all contributors to this repo

CONTRIBUTORS

@@ -1,26 +1,36 @@
-Scott Beamer                    <[email protected]>
-Christopher Celio               <[email protected]>
-Henry Cook                      <[email protected]>
-Palmer Dabbelt                  <[email protected]>
-Schuyler Eldridge               <[email protected]>
-Adam Izraelevitz                <[email protected]>
-Philipp Jantscher               <[email protected]>
-Sagar Karandikar                <[email protected]>
-Ben Keller                      <[email protected]>
-Donggyu Kim                     <[email protected]>
-Jack Koenig
-Jim Lawson                      <[email protected]>
-Yunsup Lee                      <[email protected]>
-Richard Lin                     <[email protected]>
-Albert Magyar                   <[email protected]>
-Howard Mao                      <[email protected]>
-Miquel Moreto                   <[email protected]>
-Albert Ou                       <[email protected]>
-Colin Schmidt                   <[email protected]>
-Wei Song                        <[email protected]>
-Stephen Twigg                   <[email protected]>
-Huy Vo                          <[email protected]>
-Stefan Wallentowitz             <[email protected]>
-Andrew Waterman                 <[email protected]>
-John Wright                     <[email protected]>
-Iori Yoneji                     <[email protected]>
+Ordered by last name.
+
+Name                            Email                                   Note
+===================================================================================================================================
+Krste Asanović                  <[email protected]>                    Team member of UC Berkeley/SiFive
+Scott Beamer                    <[email protected]>             Team member of UC Berkeley
+Alex Bradbury                   <[email protected]>                       Team member of Cambridge/lowRISC
+Christopher Celio               <[email protected]>               Team member of UC Berkeley
+Henry Cook                      <[email protected]>               Team member of UC Berkeley/SiFive
+Palmer Dabbelt                  <[email protected]>      Team member of UC Berkeley
+Schuyler Eldridge               <[email protected]>           Contributor to Rocket chip
+Gary Guo                        <[email protected]>                  Contributor to lowRISC, on-chip interconnects
+Adam Izraelevitz                <[email protected]>                      Team member of UC Berkeley
+Philipp Jantscher               <[email protected]>              Contributor to lowRISC, adding tagged memory to debug-v0.3
+Sagar Karandikar                <[email protected]>              Team member of UC Berkeley
+Ben Keller                      <[email protected]>             Team member of UC Berkeley
+Donggyu Kim                     <[email protected]>               Team member of UC Berkeley
+Jonathan Kimmitt                <[email protected]>                       Team member of Cambridge/lowRISC
+Jack Koenig                                                             Team member of UC Berkeley
+Jim Lawson                      <[email protected]>                   Team member of UC Berkeley
+Yunsup Lee                      <[email protected]>              Team member of UC Berkeley/SiFive
+Richard Lin                     <[email protected]>                Team member of UC Berkeley
+Albert Magyar                   <[email protected]>            Team member of UC Berkeley
+Howard Mao                      <[email protected]>              Team member of UC Berkeley
+Miquel Moreto                   <[email protected]>                    Contributor to Rocket chip
+Robert Mullins                  <[email protected]>           Team member of Cambridge/lowRISC
+Albert Ou                       <[email protected]>                 Team member of UC Berkeley/Sifive
+Colin Schmidt                   <[email protected]>              Team member of UC Berkeley
+Wei Song                        <[email protected]>                     Team member of Cambridge/lowRISC
+Furkan Turan                    <[email protected]>              Contributor to lowRISC, port debug-v0.3 to Zedboard
+Stephen Twigg                   <[email protected]>             Team member of UC Berkeley
+Huy Vo                          <[email protected]>             Team member of UC Berkeley
+Philipp Wagner                  <[email protected]>             Team member of OpenSocDebug
+Stefan Wallentowitz             <[email protected]>                Team member of lowRISC/OpenSocDebug
+Andrew Waterman                 <[email protected]>                     Team member of UC Berkeley/Sifive
+John Wright                     <[email protected]>          Team member of UC Berkeley

LICENSE.Cambridge

@@ -1,9 +1,13 @@
 Copyright 2015-2017 University of Cambridge
-Copyright and related rights are licensed under the Solderpad Hardware
-License, Version 0.51 (the “License”); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://solderpad.org/licenses/SHL-0.51. Unless required by applicable law
-or agreed to in writing, software, hardware and materials distributed under
-this License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License. 
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.