aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-01-24 02:14:25 -0500
committerJeff Garzik <jeff@garzik.org>2007-01-24 02:14:25 -0500
commite47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch)
tree57389653c37d001de3a90655cb4172ba29199ce4 /README
parentd344bff9c36db17dc4765215495aaa7212c1eb6c (diff)
parent419dd8378dfa32985672ab7927b4bc827f33b332 (diff)
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index c055615230..46a66c6e76 100644
--- a/README
+++ b/README
@@ -278,8 +278,8 @@ IF SOMETHING GOES WRONG:
278 the file MAINTAINERS to see if there is a particular person associated 278 the file MAINTAINERS to see if there is a particular person associated
279 with the part of the kernel that you are having trouble with. If there 279 with the part of the kernel that you are having trouble with. If there
280 isn't anyone listed there, then the second best thing is to mail 280 isn't anyone listed there, then the second best thing is to mail
281 them to me (torvalds@osdl.org), and possibly to any other relevant 281 them to me (torvalds@linux-foundation.org), and possibly to any other
282 mailing-list or to the newsgroup. 282 relevant mailing-list or to the newsgroup.
283 283
284 - In all bug-reports, *please* tell what kernel you are talking about, 284 - In all bug-reports, *please* tell what kernel you are talking about,
285 how to duplicate the problem, and what your setup is (use your common 285 how to duplicate the problem, and what your setup is (use your common