diff mbox

[U-Boot,v2,01/30] dm: Fix repeated comment in README

Message ID 1410784427-23909-2-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Sept. 15, 2014, 12:33 p.m. UTC 
A merge error ended up repeating a similar sentence twice. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Add new patch to fix README merge error

 README | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Simon Glass Sept. 26, 2014, 6:58 p.m. UTC | #1 
On 15 September 2014 06:33, Simon Glass <sjg@chromium.org> wrote:
> A merge error ended up repeating a similar sentence twice. Fix it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm and now in mainline.
diff mbox

Patch

diff --git a/README b/README
index 0a0f528..298e8d6 100644
--- a/README
+++ b/README
@@ -3849,12 +3849,9 @@  Configuration Settings:
 		The memory will be freed (or in fact just forgotton) when
 		U-Boot relocates itself.
 
-		Pre-relocation malloc() is only supported on sandbox
+		Pre-relocation malloc() is only supported on ARM and sandbox
 		at present but is fairly easy to enable for other archs.
 
-		Pre-relocation malloc() is only supported on ARM at present
-		but is fairly easy to enable for other archs.
-
 - CONFIG_SYS_BOOTM_LEN:
 		Normally compressed uImages are limited to an
 		uncompressed size of 8 MBytes. If this is not enough,