diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /Documentation/arm/SA1100/Victor | |
parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'Documentation/arm/SA1100/Victor')
-rw-r--r-- | Documentation/arm/SA1100/Victor | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/SA1100/Victor b/Documentation/arm/SA1100/Victor index f938a29fdc20..9cff415da5a7 100644 --- a/Documentation/arm/SA1100/Victor +++ b/Documentation/arm/SA1100/Victor | |||
@@ -3,7 +3,7 @@ VisuAide, Inc. to be used by blind people. | |||
3 | 3 | ||
4 | For more information related to Victor, see: | 4 | For more information related to Victor, see: |
5 | 5 | ||
6 | http://www.visuaide.com/victor | 6 | http://www.humanware.com/en-usa/products |
7 | 7 | ||
8 | Of course Victor is using Linux as its main operating system. | 8 | Of course Victor is using Linux as its main operating system. |
9 | The Victor implementation for Linux is maintained by Nicolas Pitre: | 9 | The Victor implementation for Linux is maintained by Nicolas Pitre: |