Merged em driver

The next driver I that I release via Intel channels is going to
merge the code for 6 and 7. I was thinking that I could check that
into the tip and it would make the most current version buildable
on either RELEASE, was wondering if that is looked upon favorably
or not? I have code ready to do that if getting it into 7.0 would be
desireable.

Jack