diff options
| author | Jiri Kosina | 2009-12-07 18:36:35 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2009-12-07 18:36:35 +0100 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/ata/pata_cs5535.c | |
| parent | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | tree-wide: fix misspelling of "definition" in comments (diff) | |
| download | kernel-qcow2-linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.gz kernel-qcow2-linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz kernel-qcow2-linux-d014d043869cdc591f3a33243d3481fa4479c2d0.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/ata/pata_cs5535.c')
| -rw-r--r-- | drivers/ata/pata_cs5535.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 403f56165cec..71cef9a962d4 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c @@ -4,7 +4,7 @@ * Alan Cox <alan@lxorguk.ukuu.org.uk> * * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and - * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de + * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de> * and Alexander Kiausch <alex.kiausch@t-online.de> * * This program is free software; you can redistribute it and/or modify |