linux-next: manual merge of the staging tree with the driver-coretree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/misc/Makefile between commit 6a7e2618b3db ("misc: MAX8997: Remove
max8997-muic driver") from the driver-core tree and commit ffc2825c2942
("Staging: mei: move the mei code out of staging") from the staging tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/misc/Makefile
index b26495a,0f6af6a..0000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -48,3 -48,5 +48,4 @@@ obj-y				+= lis3lv02d
  obj-y				+= carma/
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
  obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
 -obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o
+ obj-$(CONFIG_INTEL_MEI)		+= mei/

Attachment: pgp00000.pgp
Description: PGP signature