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

From: Stephen Rothwell
Date: Sun Dec 23 2012 - 17:52:18 EST

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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature