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/FreeBird | |
| 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/FreeBird')
| -rw-r--r-- | Documentation/arm/SA1100/FreeBird | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/SA1100/FreeBird b/Documentation/arm/SA1100/FreeBird index eda28b3232e7..fb23b770aaf4 100644 --- a/Documentation/arm/SA1100/FreeBird +++ b/Documentation/arm/SA1100/FreeBird | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | Freebird-1.1 is produced by Legned(C) ,Inc. | 1 | Freebird-1.1 is produced by Legned(C) ,Inc. |
| 2 | (http://www.legend.com.cn) | 2 | http://web.archive.org/web/*/http://www.legend.com.cn |
| 3 | and software/linux mainatined by Coventive(C),Inc. | 3 | and software/linux mainatined by Coventive(C),Inc. |
| 4 | (http://www.coventive.com) | 4 | (http://www.coventive.com) |
| 5 | 5 | ||