linux-next: manual merge of the mips tree with the arm-soc tree

Hi all, Today's linux-next merge of the mips tree got a conflict in: drivers/video/fbdev/Makefile between commit: c7b46e0c33c5946 ("fbdev: remove w90x900/nuc900 platform drivers") from the arm-soc tree and commit: e305bff3a706f58 ("video/fbdev: Drop JZ4740 driver") from the mips tree.

linux-next: manual merge of the mips tree with the arm-soc tree

Hi all, Today's linux-next merge of the mips tree got a conflict in: drivers/video/fbdev/Makefile between commit: c7b46e0c33c5 ("fbdev: remove w90x900/nuc900 platform drivers") from the arm-soc tree and commit: e305bff3a706 ("video/fbdev: Drop JZ4740 driver") from the mips tree. I

linux-next: manual merge of the mips tree with the arm-soc tree

Hi Ralf, Today's linux-next merge of the mips tree got a conflict in drivers/bus/Makefile between commit 6320c41198c7 ("drivers: bus: Sort Makefile entries alphabetically") from the arm-soc tree and commit cd46cf20d04a ("MIPS: Add CDMM bus support") from the mips tree. I fixed it up (see below)

linux-next: manual merge of the mips tree with the arm-soc tree

Hi Ralf, Today's linux-next merge of the mips tree got a conflict in drivers/bus/Makefile between commit 6320c41198c7 (drivers: bus: Sort Makefile entries alphabetically) from the arm-soc tree and commit cd46cf20d04a (MIPS: Add CDMM bus support) from the mips tree. I fixed it up (see below) and