Process to merge Openchrome work

[James Simmons]

Hello!!

	This last year the Openchrome support for the VIA chipsets has 
come along way from being in a state of decay. The plan is to release
a Xorg driver June 1 that will have support for the KMS as well as UMS.
The goal is to have this xorg driver out in the wild before the kernel
side is ready so that the migration to the new kernel drivers will be
as painless as possible. My hope is to merge the kernel tree for public 
use for Christmas.
	This brings up the question I had with the other project leader.
How does one go about merging the tree? What makes this more complex is
that a old via drm kernel driver already exist. Do we just drop in the 
code into the staging area? Does it have to be piece meal? Does a rename 
of the driver need to happen? What would you recommend ?