[git pull] Please pull powerpc.git merge branch

[Josh Boyer]

On Thu, Sep 18, 2008 at 11:43:24AM -0500, Timur Tabi wrote:
>On Thu, Sep 18, 2008 at 11:36 AM, Paul Mackerras <paulus at samba.org> wrote:
>>    powerpc: Fix interrupt values for DMA2 in MPC8610 HPCD device tree
>>
>>    For Freescale 8xxx devices that use an MPIC, the interrupt numbers in
>>    the device tree must be 16 greater than the values documented in the
>>    reference manual.  In these chips, the MPIC is wired to use the first
>>    16 numbers for external interrupts, but the documentation numbers
>>    internal interrupts from 0.
>>
>>    In the MPC8610 HPCD device tree, the interrupt properties for the DMA
>>    channels for DMA2 were not the adjusted values.  This fixes that.
>
>Did you edit this patch when you pulled it from Kumar's repo?  The
>commit in Kumar's repo says "This patch fixes that.", which is what I
>wrote.  However, in your tree, the word "patch" is missing.

Yes.  He edits them often for various reasons.  In this case, the word
"patch" is arguably incorrect, as it's now a commit.  So my assumption is
that he left off the noun for the "fix" entirely to avoid stuff like that.

josh