diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /drivers/ata/pata_isapnp.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/ata/pata_isapnp.c')
| -rw-r--r-- | drivers/ata/pata_isapnp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c index 6a111baab523..15cdb9148aab 100644 --- a/drivers/ata/pata_isapnp.c +++ b/drivers/ata/pata_isapnp.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | /* | 2 | /* |
| 3 | * pata-isapnp.c - ISA PnP PATA controller driver. | 3 | * pata-isapnp.c - ISA PnP PATA controller driver. |
| 4 | * Copyright 2005/2006 Red Hat Inc <alan@redhat.com>, all rights reserved. | 4 | * Copyright 2005/2006 Red Hat Inc, all rights reserved. |
| 5 | * | 5 | * |
| 6 | * Based in part on ide-pnp.c by Andrey Panin <pazke@donpac.ru> | 6 | * Based in part on ide-pnp.c by Andrey Panin <pazke@donpac.ru> |
| 7 | */ | 7 | */ |