Subject: Re: [git pull] Please pull powerpc.git next branch

From: Benjamin Herrenschmidt <[email-masked]>
Date: Sat, 22 May 2010 08:38:13 +1000

On Fri, 2010-05-21 at 15:04 +0200, Wolfram Sang wrote:
> > Wolfram Sang (4):
> >       powerpc/pmac: Fix dangling pointers
> >       i2c/mpc: Drop NO_IRQ
> >       i2c/cpm: Drop NO_IRQ
> >       i2c/ibm-iic: Drop NO_IRQ
> 
> Sorry for the confusion, but the other Ben (Dooks) has pushed those
> NO_IRQ-thigies meanwhile.

That shouldn't be a problem. git or Linus should sort it out easily :-)
I did a test merge before sending the pull request and there was nothing
it wouldn't resolve automatically.

Cheers,
Ben.