diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/nwfpe/softfloat-specialize | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/nwfpe/softfloat-specialize')
| -rw-r--r-- | arch/arm/nwfpe/softfloat-specialize | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/nwfpe/softfloat-specialize b/arch/arm/nwfpe/softfloat-specialize index d4a4c8e06635..679a0269dd25 100644 --- a/arch/arm/nwfpe/softfloat-specialize +++ b/arch/arm/nwfpe/softfloat-specialize | |||
| @@ -12,8 +12,8 @@ National Science Foundation under grant MIP-9311980. The original version | |||
| 12 | of this code was written as part of a project to build a fixed-point vector | 12 | of this code was written as part of a project to build a fixed-point vector |
| 13 | processor in collaboration with the University of California at Berkeley, | 13 | processor in collaboration with the University of California at Berkeley, |
| 14 | overseen by Profs. Nelson Morgan and John Wawrzynek. More information | 14 | overseen by Profs. Nelson Morgan and John Wawrzynek. More information |
| 15 | is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/ | 15 | is available through the Web page |
| 16 | arithmetic/softfloat.html'. | 16 | http://www.jhauser.us/arithmetic/SoftFloat-2b/SoftFloat-source.txt |
| 17 | 17 | ||
| 18 | THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort | 18 | THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort |
| 19 | has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT | 19 | has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT |