linux-next: manual merge of the tip tree with the mips tree

From: Stephen Rothwell
Date: Sun Mar 13 2016 - 22:19:09 EST

Hi all,

Today's linux-next merge of the tip tree got a conflict in:


between commit:

7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC")

from the mips tree and commit:

7eb8c99db26c ("MIPS: Delete smp-gic.c")

from the tip tree.

I fixed it up (I used the tip tree version since that removed the lines
updated by the mips tree patch) and can carry the fix as necessary
(no action is required).

Stephen Rothwell