linux-next: manual merge of the driver-core.current tree with Linus' tree

Sun, 23 Dec 2012 14:52:51 -0800 

Hi Greg,

Today's linux-next merge of the driver-core.current tree got conflicts
in 21 files in drivers/i2c between commit 0b255e927d47 ("i2c: remove
__dev* attributes from subsystem") from Linus' tree and commit
eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the
driver-core.current tree.

I fixed it up (taking a mixture of both commits) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgp8rPrxgYNe1.pgp
Description: PGP signature

Reply via email to