diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /Documentation/cris/README | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'Documentation/cris/README')
| -rw-r--r-- | Documentation/cris/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cris/README b/Documentation/cris/README index 795a1dabe6c7..d9b086869a60 100644 --- a/Documentation/cris/README +++ b/Documentation/cris/README | |||
| @@ -27,7 +27,7 @@ operating system. | |||
| 27 | The ETRAX 100LX chip | 27 | The ETRAX 100LX chip |
| 28 | -------------------- | 28 | -------------------- |
| 29 | 29 | ||
| 30 | For reference, plase see the press-release: | 30 | For reference, please see the press-release: |
| 31 | 31 | ||
| 32 | http://www.axis.com/news/us/001101_etrax.htm | 32 | http://www.axis.com/news/us/001101_etrax.htm |
| 33 | 33 | ||