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

Tue, 01 Jan 2013 15:38:01 -0800 

Hi Greg,

Today's linux-next merge of the driver-core.current tree got a conflict
in drivers/i2c/busses/i2c-au1550.c 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 (I used the driver-core.current version) and can carry the
fix as necessary (no action is required).

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

Attachment: pgpr0lU7x9nxo.pgp
Description: PGP signature

Reply via email to