Index: projects/clang400-import/contrib/dma
===================================================================
--- projects/clang400-import/contrib/dma	(revision 314284)
+++ projects/clang400-import/contrib/dma	(revision 314285)

Property changes on: projects/clang400-import/contrib/dma
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/dma:r312926
Index: projects/clang400-import/sys/contrib/dev/acpica
===================================================================
--- projects/clang400-import/sys/contrib/dev/acpica	(revision 314284)
+++ projects/clang400-import/sys/contrib/dev/acpica	(revision 314285)

Property changes on: projects/clang400-import/sys/contrib/dev/acpica
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/dev/acpica:r312926