diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /Documentation/powerpc/hvcs.txt | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'Documentation/powerpc/hvcs.txt')
| -rw-r--r-- | Documentation/powerpc/hvcs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/powerpc/hvcs.txt b/Documentation/powerpc/hvcs.txt index f93462c5db2..6d8be3468d7 100644 --- a/Documentation/powerpc/hvcs.txt +++ b/Documentation/powerpc/hvcs.txt | |||
| @@ -560,7 +560,7 @@ The proper channel for reporting bugs is either through the Linux OS | |||
| 560 | distribution company that provided your OS or by posting issues to the | 560 | distribution company that provided your OS or by posting issues to the |
| 561 | PowerPC development mailing list at: | 561 | PowerPC development mailing list at: |
| 562 | 562 | ||
| 563 | linuxppc-dev@ozlabs.org | 563 | linuxppc-dev@lists.ozlabs.org |
| 564 | 564 | ||
| 565 | This request is to provide a documented and searchable public exchange | 565 | This request is to provide a documented and searchable public exchange |
| 566 | of the problems and solutions surrounding this driver for the benefit of | 566 | of the problems and solutions surrounding this driver for the benefit of |