diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/s390/s390_rdev.c | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/s390/s390_rdev.c')
| -rw-r--r-- | drivers/s390/s390_rdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c index 566cc3d185b6..206518c7d332 100644 --- a/drivers/s390/s390_rdev.c +++ b/drivers/s390/s390_rdev.c | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * drivers/s390/s390_rdev.c | 2 | * drivers/s390/s390_rdev.c |
| 3 | * s390 root device | 3 | * s390 root device |
| 4 | * $Revision: 1.2 $ | 4 | * $Revision: 1.4 $ |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH, | 6 | * Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH, |
| 7 | * IBM Corporation | 7 | * IBM Corporation |
| 8 | * Author(s): Cornelia Huck (cohuck@de.ibm.com) | 8 | * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) |
| 9 | * Carsten Otte (cotte@de.ibm.com) | 9 | * Carsten Otte (cotte@de.ibm.com) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||