Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 3ffc6979d16..0fae51c4845 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1313,7 +1313,7 @@ static int _regulator_enable(struct regulator_dev *rdev)
                                 return -EINVAL;
 
                         /* Query before enabling in case configuration
-                         * dependant.  */
+                         * dependent.  */
                         ret = _regulator_get_enable_time(rdev);
                         if (ret >= 0) {
                                 delay = ret;