diff options
author | Jeff Hartmann <jhartmann@valinux.com> | 2000-03-16 03:37:30 +0000 |
---|---|---|
committer | Jeff Hartmann <jhartmann@valinux.com> | 2000-03-16 03:37:30 +0000 |
commit | 5bd8014f276d447178a1193d9dea1b976647d6ce (patch) | |
tree | cafe59205a3cf689f2efc31f2c8da11ce2c53e3e /linux/dma.c | |
parent | adc03d3661117a687b5e1686f11b4b1314922203 (diff) |
Merge with 4.0
Diffstat (limited to 'linux/dma.c')
-rw-r--r-- | linux/dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/dma.c b/linux/dma.c index 2efeba35..8291e52e 100644 --- a/linux/dma.c +++ b/linux/dma.c @@ -24,8 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.7 1999/09/16 16:56:18 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.4 2000/02/14 06:27:26 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.5 2000/02/23 04:47:26 martin Exp $ * */ |