[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Wed, 2 Jan 2013 10:37:26 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Bill Pemberton <wfp5p@...ginia.edu>,
Wolfram Sang <w.sang@...gutronix.de>
Subject: linux-next: manual merge of the driver-core.current tree with Linus
tree
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 sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists