OpenSolaris. Our local diffs to these files in HEAD already contain all these changes (and in fact seem to be based on these versions of the files). It seems the vendor branch just has older versions somehow.
(for userland bits) and vendor-sys/opensolaris (for kernel bits) and flatten the trees. Discussed with: peter, jb, gnn