[lkml]   [2014]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the mfd tree with Linus' tree
Hi Lee,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/viperboard.c between commit b6684228726c ("mfd: viperboard:
Fix platform-device id collision") from Linus' tree and commit
5e65ea8c48e6 ("mfd: Use mfd_add_hotplug_devices() helper") from the mfd

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

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-11-13 03:21    [W:0.025 / U:3.616 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site