linux-next: manual merge of the drm-intel tree with Linus' tree
From: Stephen Rothwell
Date: Mon Sep 28 2015 - 21:20:38 EST
Today's linux-next merge of the drm-intel tree got a conflict in:
721a09f7393d ("drm/i915: Add primary plane to mask if it's visible")
from Linus' tree and commit:
bd0335b29903 ("drm/i915: Add primary plane to mask if it's visible")
from the drm-intel tree.
I fixed it up (I used the drm-intel tree version) and can carry the fix
as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/