Re: [git pull] Please pull powerpc.git next branch
From: Benjamin Herrenschmidt
Date: Fri May 21 2010 - 18:38:35 EST
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/