Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / hwmon / abituguru.c

diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index 8f07a9d..e7d4c46 100644 (file)
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -1,5 +1,5 @@
 /*
-    abituguru.c Copyright (c) 2005-2006 Hans de Goede <j.w.r.degoede@hhs.nl>
+    abituguru.c Copyright (c) 2005-2006 Hans de Goede <hdegoede@redhat.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1422,7 +1422,7 @@ static int __init abituguru_detect(void)
           at DATA and 0xAC, when this driver has already been loaded once
           DATA will hold 0x08. For most uGuru's CMD will hold 0xAC in either
           scenario but some will hold 0x00.
-          Some uGuru's initally hold 0x09 at DATA and will only hold 0x08
+          Some uGuru's initially hold 0x09 at DATA and will only hold 0x08
           after reading CMD first, so CMD must be read first! */
        u8 cmd_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_CMD);
        u8 data_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_DATA);
@@ -1505,7 +1505,7 @@ static void __exit abituguru_exit(void)
        platform_driver_unregister(&abituguru_driver);
 }
 
-MODULE_AUTHOR("Hans de Goede <j.w.r.degoede@hhs.nl>");
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("Abit uGuru Sensor device");
 MODULE_LICENSE("GPL");