summaryrefslogtreecommitdiff
path: root/Documentation/HOWTO
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-04-29 07:36:24 (GMT)
committerJens Axboe <jens.axboe@oracle.com>2010-04-29 07:36:24 (GMT)
commit7407cf355fdf5500430be966dbbde84a27293bad (patch)
tree922861288ff38558ed721a79653f52b17b13bb95 /Documentation/HOWTO
parent6a47dc1418682c83d603b491df1d048f73aa973e (diff)
parent79dba2eaa771c3173957eccfd288e0e0d12e4d3f (diff)
downloadlinux-fsl-qoriq-7407cf355fdf5500430be966dbbde84a27293bad.tar.xz
Merge branch 'master' into for-2.6.35
Conflicts: fs/block_dev.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'Documentation/HOWTO')
-rw-r--r--Documentation/HOWTO2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO
index f5395af..40ada93 100644
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
@@ -234,7 +234,7 @@ process is as follows:
Linus, usually the patches that have already been included in the
-next kernel for a few weeks. The preferred way to submit big changes
is using git (the kernel's source management tool, more information
- can be found at http://git.or.cz/) but plain patches are also just
+ can be found at http://git-scm.com/) but plain patches are also just
fine.
- After two weeks a -rc1 kernel is released it is now possible to push
only patches that do not include new features that could affect the