linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell
Date: Mon May 14 2012 - 00:08:25 EST
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_ringbuffer.c between commit 2e7a44814d80
("drm/i915: Do no set Stencil Cache eviction LRA w/a on gen7+") from
Linus' tree and commit 6b26c86d6157 ("drm/i915: create macros to handle
masked bits") from the drm tree.
I used the drm tree version.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature