diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /Documentation/cris/README | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.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 | ||