On Wed, Jan 12, 2011 at 2:29 PM, Ben Dooks <ben-linux@xxxxxxxxx> wrote:
>
> Ben Dooks (7):
> Merge branch 'for-2638/i2c/mv64xx' into for-linus/i2c-2638
> Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638
> Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
> Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638
> Merge branch 'for-2638/i2c/intel' into for-linus/i2c-2638
> Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
> Merge branch 'for-2638/i2c/bfin2' into for-linus/i2c-2638
Btw, this is where octopus merges are just very nice.
IOW, just do
git merge for-2638/i2c/mv64xx for-2638/i2c/omap for-2638/i2c/iop
for-2638/i2c/ocores for-2638/i2c/intel for-2638/i2c/nomadik
for-2638/i2c/bfin2
and it actually ends up looking much better.
Of course, it does make bisecting a bit harder, but when you have lots
of branches with just one or two commits each, and they are pretty
independent (so a bug in one is unlikely to be mistaken for a bug in
another), octopus really is the way to go.
Anyway, pulled.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
