MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <18743.5311.794489.670294@cargo.ozlabs.ibm.com>
Date: Thu, 4 Dec 2008 10:22:39 +1100
From: Paul Mackerras <paulus@samba.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
CC: linuxppc-dev@ozlabs.org, akpm@linux-foundation.org,
       linux-kernel@vger.kernel.org
Subject: Re: [git pull] Please pull powerpc.git merge branch
In-Reply-To: <18742.27860.32471.101697@cargo.ozlabs.ibm.com>
References: <18742.27860.32471.101697@cargo.ozlabs.ibm.com>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1019
Lines: 33

I wrote:

> Please pull from the 'merge' branch of
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
> 
> to get one commit from Ben Herrenschmidt that fixes a regression since
> 2.6.27.

I have just added one more commit from Kumar's merge branch, so when
you pull the diffstat should be:

 arch/powerpc/boot/dts/mpc8349emitx.dts |   16 ++++++++--------
 arch/powerpc/kernel/dma.c              |    1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

If you had already pulled, please pull again, or pull Kumar's merge
branch directly.

Thanks,
Paul.

Anton Vorontsov (1):
      powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

Benjamin Herrenschmidt (1):
      powerpc: Fix dma_map_sg() cache flushing on non coherent platforms

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/