diff --git a/[refs] b/[refs] index 0658cbc73fa6..2a5bda9c22d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 693ac389326a87d608baa2902c45a6e78ed46681 +refs/heads/master: d9f3216b474be170d0c093d70125b541ace58704 diff --git a/trunk/kernel/dma.c b/trunk/kernel/dma.c index d2c60a822790..f903189c5304 100644 --- a/trunk/kernel/dma.c +++ b/trunk/kernel/dma.c @@ -1,4 +1,4 @@ -/* $Id: dma.c,v 1.7 1994/12/28 03:35:33 root Exp root $ +/* * linux/kernel/dma.c: A DMA channel allocator. Inspired by linux/kernel/irq.c. * * Written by Hennus Bergman, 1992.