On Tue, Jul 1, 2014 at 10:24 AM, Jani Nikula <jani.nikula@xxxxxxxxx> wrote: > As discussed, it contains acpi-next as a dependency for Jesse's S0ix > work through these merges (should not conflict, fingers crossed): Aside: This is acpi-next for 3.16, so _really_ shouldn't conflict. It's only in there since at the time I've merged Jesse's soix patches I didn't yet roll drm-intel-next forward to post-rc1 - I tend to only do that once drm-next has rolled forward first. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
