diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 21:21:07 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 21:21:07 +0800 |
commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /drivers/ide/qd65xx.c | |
parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'drivers/ide/qd65xx.c')
-rw-r--r-- | drivers/ide/qd65xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c index 5b2e3af43c4..08c4fa35e9b 100644 --- a/drivers/ide/qd65xx.c +++ b/drivers/ide/qd65xx.c @@ -16,7 +16,7 @@ /* * Rewritten from the work of Colten Edwards <pje120@cs.usask.ca> by - * Samuel Thibault <samuel.thibault@fnac.net> + * Samuel Thibault <samuel.thibault@ens-lyon.org> */ #include <linux/module.h> |