[alsa-devel] Merging hg sources into kernel tree

Is there a script to merge the hg sources into a kernel tree? If not do I need to worry about any changes other than the include/ directory? I have another module (cx88-alsa) that is in v4l but needs the newer alsa tree or I get "cx88_alsa: disagrees about version of symbol xxx", so I have to merge the sources for now.

Andrew Boettcher