]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.git/commitdiff
Merge branch 'xen/dom0/drm' into xen/master
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tue, 22 Sep 2009 22:21:28 +0000 (15:21 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tue, 22 Sep 2009 22:21:28 +0000 (15:21 -0700)
* xen/dom0/drm:
  swiotlb: linux/swiotlb.h needs linux/dma-mapping.h


Trivial merge