Commit 673c790e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68k nommu fix from Greg Ungerer:
 "Only a single change to fix an out of bounds array access when parsing
  boot command line"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: fix command-line parsing when passed from u-boot
parents 83e7e5b5 381fdd62
...@@ -102,5 +102,5 @@ __init void process_uboot_commandline(char *commandp, int size) ...@@ -102,5 +102,5 @@ __init void process_uboot_commandline(char *commandp, int size)
} }
parse_uboot_commandline(commandp, len); parse_uboot_commandline(commandp, len);
commandp[size - 1] = 0; commandp[len - 1] = 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment