linux-next: manual merge of the bjdooks-i2c tree with Linus' tree

[Stephen Rothwell]

Hi Ben,

Today's linux-next merge of the bjdooks-i2c tree got a conflict in
drivers/i2c/busses/i2c-omap.c between various commits from Linus' tree
and commit d06333b7a618 ("i2c: OMAP: Add DT support for i2c controller")
from the bjdooks-i2c tree.

This was a complex conflict and since the bjdooks-i2c tree has not been
updated since May 3 and I have been unable to access it for some time, I
just dropped it for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature