Re: [git tree] drm tree for 2.6.15

[Linus Torvalds]

On Tue, 1 Nov 2005, Dave Airlie wrote:
>
> 	Can you pull the drm-linus branch from
> 
> 	www.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
> 
> It is mainly a lindenting of the DRM along with an updated radeon DRM to
> support PCI Express R300 cards, along with some sparse fixes..

I got a few merge clashes with the previous fix from Ivan Kokshaysky, 
which I fixed up by hand.

I think I did them right, but you should check.

		Linus
-
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/