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

From: Mark Brown <[email-masked]>
Date: Tue, 11 Mar 2014 19:03:46 +0000

Hi all,

Today's linux-next merge of the tip tree got a conflict in drivers/video/fbdev/sgivwfb.c between commit 844901baede6b5 ("video: move fbdev to drivers/video/fbdev") from the omap2_dss tree and commit c5f9ee3d665a76 ("x86, platforms: Remove SGI Visual Workstation") from the tip tree.

I fixed it up by deleting the offending driver and can carry the fix as necessary (no action is required).