[GIT PULL V2] ARM: mvebu: dt changes for v3.15 (incr. pull #3)

[Jason Cooper]

On Mon, Mar 17, 2014 at 11:11:30AM +0100, Arnd Bergmann wrote:
> On Tuesday 04 March 2014, Jason Cooper wrote:
> > V2: removed the dove PMU interrupt node (er, undid the re-addition of
> > the node.  ie: let the revert stand).  So, commit id's for this pull
> > only are changed.  No previous pulls or tags affected.  Confirmed the
> > change with a diff between the old branch and the new branch.  And did a
> > run of building dtbs.  No problems.  Sorry for the confusion.
> > 
> > Russell just raised a very valid point today regarding the overall
> > design of an eventual PMU driver that would cover several tasks we
> > hadn't considered with the original binding.  Better to pull it now than
> > have to support it indefinitely.  Revert of the driver in the works.
> > 
> > --- original text ---
> > 
> > Here's another rather large round of DT changes for mvebu.  It's all
> > summed up below and has been in -next for a while now.
> > 
> > This is an incremental pull from tags/mvebu-dt-3.15-2 in the mvebu/dt
> > branch up to tags/mvebu-dt-3.15-3.
> > 
> 
> Pulled into next/dt now, along with the #4 and #5. I got a trivial
> merge conflict against the dts Makefile change from mach-qcom and
> noticed that splitting up the dtb section into per-soc breaks
> alphabetical ordering, which I changed in the merge by moving
> it down to the end of the list.

Ok, I was trying to reduce conflicts by leaving things in place, then
do a fixes-non-critical patch to put things back in alphabetical order
after the dust had settled.

Stephen will probably want me to drop my resolution in mvebu's for-next
so that we don't conflict.

thx,

Jason.