Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

2013-11-04 Thread Rob Herring
On 11/04/2013 08:36 AM, Shawn Guo wrote: > On Mon, Nov 04, 2013 at 08:15:50AM -0600, Rob Herring wrote: >> On 11/04/2013 07:17 AM, Shawn Guo wrote: >>> On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote: Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict

Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

2013-11-04 Thread Shawn Guo
On Mon, Nov 04, 2013 at 08:15:50AM -0600, Rob Herring wrote: > On 11/04/2013 07:17 AM, Shawn Guo wrote: > > On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote: > >> Hi Rob, > >> > >> Today's linux-next merge of the dt-rh tree got a conflict in > >> Documentation/devicetree/bindings/ve

Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

2013-11-04 Thread Rob Herring
On 11/04/2013 07:17 AM, Shawn Guo wrote: > On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote: >> Hi Rob, >> >> Today's linux-next merge of the dt-rh tree got a conflict in >> Documentation/devicetree/bindings/vendor-prefixes.txt between commit >> 064d7f6c985a ("ARM: dts: Add vendor p

Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

2013-11-04 Thread Shawn Guo
On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote: > Hi Rob, > > Today's linux-next merge of the dt-rh tree got a conflict in > Documentation/devicetree/bindings/vendor-prefixes.txt between commit > 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies > s.r.o") from th

linux-next: manual merge of the dt-rh tree with the imx-mxs tree

2013-11-03 Thread Stephen Rothwell
Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict in Documentation/devicetree/bindings/vendor-prefixes.txt between commit 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort vendor-prefixes.txt") from t