| Message ID | Pine.LNX.4.64.1302121533590.7059@axis700.grange (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
On Tue, Feb 12, 2013 at 03:55:33PM +0100, Guennadi Liakhovetski wrote: > A semicolon went missing in the merge Thanks, it seems that I was careless. I have resolved this be re-merging. topic/all+next should no longer feature this problem. > > commit 6dffe18b5dbe1e3d5ccf1792a4793c854bad7e87 > Merge: 95c746f 68c80f0 > Author: Simon Horman <horms+renesas@verge.net.au> > Date: Thu Feb 7 17:23:58 2013 +0900 > > Merge branch 'topic/pfc' into topic/all+next > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > arch/arm/boot/dts/sh73a0.dtsi | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi > index ebbd604..c97edb2 100644 > --- a/arch/arm/boot/dts/sh73a0.dtsi > +++ b/arch/arm/boot/dts/sh73a0.dtsi > @@ -35,5 +35,5 @@ > <0xe605801c 0x1c>; > gpio-controller; > #gpio-cells = <2>; > - } > + }; > }; > -- > 1.7.2.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index ebbd604..c97edb2 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -35,5 +35,5 @@ <0xe605801c 0x1c>; gpio-controller; #gpio-cells = <2>; - } + }; };
A semicolon went missing in the merge commit 6dffe18b5dbe1e3d5ccf1792a4793c854bad7e87 Merge: 95c746f 68c80f0 Author: Simon Horman <horms+renesas@verge.net.au> Date: Thu Feb 7 17:23:58 2013 +0900 Merge branch 'topic/pfc' into topic/all+next Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- arch/arm/boot/dts/sh73a0.dtsi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)