-next merged with Linus tree

[Christian König]

On 20.07.2012 07:34, Dave Airlie wrote:
> Hi,
>
> I've just merged Linus tree into drm-next and fixes up the conflicts,
> some in i915, one in radeon.
>
> Can you guys check that they look correct after it?
Have to test it a bit more, but at least 
drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.

Christian.

>
> I'll leave it just on my drm-next branch for now.
>
> Thanks,
> Dave.
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>