From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Tue, 22 Sep 2009 22:21:28 +0000 (-0700)
Subject: Merge branch 'xen/dom0/drm' into xen/master
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=398b4b4cabdb27c06a7b8214c2044347ffc08c49;p=people%2Fssmith%2Fnetchannel2-pvops.git

Merge branch 'xen/dom0/drm' into xen/master

* xen/dom0/drm:
  swiotlb: linux/swiotlb.h needs linux/dma-mapping.h
---

398b4b4cabdb27c06a7b8214c2044347ffc08c49