Subject: linux-next: manual merge of the init tree with the mips tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 4 Jun 2015 21:35:29 +1000

Hi Paul,

Today's linux-next merge of the init tree got a conflict in
arch/mips/loongson64/common/serial.c between commit d4d269403794
("mips: make loongsoon serial driver explicitly modular") from the mips
tree and commit 3a283d1794f5 ("mips: make loongsoon serial driver
explicitly modular") from the init tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]