From mboxrd@z Thu Jan 1 00:00:00 1970 From: shawn.guo@linaro.org (Shawn Guo) Date: Tue, 6 Jan 2015 19:03:55 +0800 Subject: [PATCH] ARM: dts: imx28-evk: remove duplicate property In-Reply-To: <102569001.493493.1419245731445.JavaMail.open-xchange@oxbaltgw00.schlund.de> References: <1412715639-9565-1-git-send-email-mhei@heimpold.de> <102569001.493493.1419245731445.JavaMail.open-xchange@oxbaltgw00.schlund.de> Message-ID: <20150106110352.GI24511@dragon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Dec 22, 2014 at 11:55:31AM +0100, Stefan Wahren wrote: > Hi Shawn, > > [Fix Shawn's mail address] > > > Fabio Estevam hat am 8. Oktober 2014 um 02:18 > > geschrieben: > > > > > > On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold wrote: > > > Seems to be a left-over from an automatic merge. > > > > > > Signed-off-by: Michael Heimpold > > > Cc: Fabio Estevam > > > --- > > > arch/arm/boot/dts/imx28-evk.dts | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/arch/arm/boot/dts/imx28-evk.dts > > > b/arch/arm/boot/dts/imx28-evk.dts > > > index 09664fc..2944d39 100644 > > > --- a/arch/arm/boot/dts/imx28-evk.dts > > > +++ b/arch/arm/boot/dts/imx28-evk.dts > > > @@ -182,7 +182,6 @@ > > > }; > > > > > > lradc at 80050000 { > > > - fsl,lradc-touchscreen-wires = <4>; > > > > Thanks > > > > Reviewed-by: Fabio Estevam > > > > did you get this patch? Sorry, missed it. Applied. Shawn