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 /shared | |
| parent | adc03d3661117a687b5e1686f11b4b1314922203 (diff) | |
Merge with 4.0ati-4-0-1-20000319-baseX_4_0-20000315-merge
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/drm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/shared/drm.h b/shared/drm.h index 7488a315e..7b8e88265 100644 --- a/shared/drm.h +++ b/shared/drm.h @@ -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/drm.h,v 1.46 1999/08/20 20:00:53 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.4 2000/02/14 06:27:26 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.5 2000/02/23 04:47:26 martin Exp $ * * Acknowledgements: * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg. |