diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/misc | |
parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/parport_pc.c | 2 | ||||
-rw-r--r-- | drivers/misc/parport_procfs.c | 2 | ||||
-rw-r--r-- | drivers/misc/parport_share.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/parport_pc.c b/drivers/misc/parport_pc.c index 334f9a1d2..db3c3f7ab 100644 --- a/drivers/misc/parport_pc.c +++ b/drivers/misc/parport_pc.c @@ -4,7 +4,7 @@ * Tim Waugh <tim@cyberelk.demon.co.uk> * Jose Renau <renau@acm.org> * David Campbell <campbell@torque.net> - * Andrea Arcangeli <arcangeli@mbox.queen.it> + * Andrea Arcangeli * * based on work by Grant Guenther <grant@torque.net> and Phil Blundell. */ diff --git a/drivers/misc/parport_procfs.c b/drivers/misc/parport_procfs.c index 07e8edaee..b7d35eea4 100644 --- a/drivers/misc/parport_procfs.c +++ b/drivers/misc/parport_procfs.c @@ -3,7 +3,7 @@ * Authors: David Campbell <campbell@torque.net> * Tim Waugh <tim@cyberelk.demon.co.uk> * Philip Blundell <philb@gnu.org> - * Andrea Arcangeli <arcangeli@mbox.queen.it> + * Andrea Arcangeli * Riccardo Facchetti <fizban@tin.it> * * based on work by Grant Guenther <grant@torque.net> diff --git a/drivers/misc/parport_share.c b/drivers/misc/parport_share.c index 32bab5e0a..353187684 100644 --- a/drivers/misc/parport_share.c +++ b/drivers/misc/parport_share.c @@ -1,11 +1,11 @@ -/* $Id: parport_share.c,v 1.18 1998/08/19 21:54:50 ralf Exp $ +/* $Id: parport_share.c,v 1.11 1998/08/25 09:17:20 ralf Exp $ * Parallel-port resource manager code. * * Authors: David Campbell <campbell@tirian.che.curtin.edu.au> * Tim Waugh <tim@cyberelk.demon.co.uk> * Jose Renau <renau@acm.org> * Philip Blundell <philb@gnu.org> - * Andrea Arcangeli <arcangeli@mbox.queen.it> + * Andrea Arcangeli * * based on work by Grant Guenther <grant@torque.net> * and Philip Blundell |