diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 09:08:27 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 09:08:27 +0200 |
commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /Documentation/HOWTO | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming... (diff) | |
parent | SH: fix error paths in DMA driver (diff) | |
download | linux-e19553427c2e8fdb04fdd98e407164bb59a840ba.tar.xz linux-e19553427c2e8fdb04fdd98e407164bb59a840ba.zip |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'Documentation/HOWTO')
-rw-r--r-- | Documentation/HOWTO | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO index f5395af88a41..40ada93b820a 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 |