lkml.org 
[lkml]   [2012]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the driver-core tree with the mfd tree
Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/tps65090.c between various commits from the mfd tree and
commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76
("mfd: remove use of __devinit") and 4740f73fe538 ("mfd: remove use of
__devexit") from the driver-core tree.

I fixed it up (by using the mfd tree version) and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-11-29 05:41    [W:0.030 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site