diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
| commit | 5205a16d8870cdd4cc524589de3e09ad176d129a (patch) | |
| tree | 6deddf1269b9e6f13f2fa00529cd4674c3b2a3fa /drivers/sbus | |
| parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) | |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/audio/audio.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/flash.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/pcikbd.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/rtc.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/uctrl.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c index 80957e0e3..31856af31 100644 --- a/drivers/sbus/audio/audio.c +++ b/drivers/sbus/audio/audio.c @@ -1,4 +1,4 @@ -/* $Id: audio.c,v 1.50 2000/03/13 03:54:07 davem Exp $ +/* $Id: audio.c,v 1.51 2000/06/19 06:24:47 davem Exp $ * drivers/sbus/audio/audio.c * * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu) diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index 38ae1e01f..dbba073de 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -1,4 +1,4 @@ -/* $Id: envctrl.c,v 1.16 2000/03/22 21:29:23 ecd Exp $ +/* $Id: envctrl.c,v 1.17 2000/06/19 06:24:47 davem Exp $ * envctrl.c: Temperature and Fan monitoring on Machines providing it. * * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 408c2c753..8bdee5e04 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -1,4 +1,4 @@ -/* $Id: flash.c,v 1.17 2000/02/10 02:51:35 davem Exp $ +/* $Id: flash.c,v 1.18 2000/06/19 06:24:47 davem Exp $ * flash.c: Allow mmap access to the OBP Flash, for OBP updates. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) diff --git a/drivers/sbus/char/pcikbd.c b/drivers/sbus/char/pcikbd.c index 99cf4e320..93673e3b8 100644 --- a/drivers/sbus/char/pcikbd.c +++ b/drivers/sbus/char/pcikbd.c @@ -1,4 +1,4 @@ -/* $Id: pcikbd.c,v 1.47 2000/06/09 07:35:40 davem Exp $ +/* $Id: pcikbd.c,v 1.48 2000/06/19 06:24:47 davem Exp $ * pcikbd.c: Ultra/AX PC keyboard support. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c index b3008859b..bda9e3a26 100644 --- a/drivers/sbus/char/rtc.c +++ b/drivers/sbus/char/rtc.c @@ -1,4 +1,4 @@ -/* $Id: rtc.c,v 1.19 2000/02/09 22:33:26 davem Exp $ +/* $Id: rtc.c,v 1.20 2000/06/19 06:24:47 davem Exp $ * * Linux/SPARC Real Time Clock Driver * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 412215291..6294d0e37 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c @@ -1,4 +1,4 @@ -/* $Id: uctrl.c,v 1.7 2000/02/09 22:33:28 davem Exp $ +/* $Id: uctrl.c,v 1.8 2000/06/19 06:24:47 davem Exp $ * uctrl.c: TS102 Microcontroller interface on Tadpole Sparcbook 3 * * Copyright 1999 Derrick J Brashear (shadow@dementia.org) |