From: Ben Peddell <klightspeed@killerwolves.net>
Date: Mon, 13 Jan 2014 22:25:18 +0000 (+0100)
Subject: ARM: 7941/2: Fix incorrect FDT initrd parameter override
X-Git-Tag: v3.14-rc1~58^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c235cb9e35407bdb4a2debeef4dc8721e8f91f2;p=pandora-kernel.git

ARM: 7941/2: Fix incorrect FDT initrd parameter override

Commit 65939301acdb (arm: set initrd_start/initrd_end for fdt scan)
caused the FDT initrd_start and initrd_end to override the
phys_initrd_start and phys_initrd_size set by the initrd= kernel
parameter.  With this patch initrd_start and initrd_end will be
overridden if phys_initrd_start and phys_initrd_size are set by the
kernel initrd= parameter.

Fixes: 65939301acdb (arm: set initrd_start/initrd_end for fdt scan)

Signed-off-by: Ben Peddell <klightspeed@killerwolves.net>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed