Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index dc9ea95c0561..ff0718efb0ae 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -523,7 +523,7 @@ unsigned long sm501_set_clock(struct device *dev,
         unsigned long clock = readl(sm->regs + SM501_CURRENT_CLOCK);
         unsigned char reg;
         unsigned int pll_reg = 0;
-        unsigned long sm501_freq; /* the actual frequency acheived */
+        unsigned long sm501_freq; /* the actual frequency achieved */
 
         struct sm501_clock to;
 
@@ -533,7 +533,7 @@ unsigned long sm501_set_clock(struct device *dev,
 
         switch (clksrc) {
         case SM501_CLOCK_P2XCLK:
-                /* This clock is divided in half so to achive the
+                /* This clock is divided in half so to achieve the
                  * requested frequency the value must be multiplied by
                  * 2. This clock also has an additional pre divisor */
 
@@ -562,7 +562,7 @@ unsigned long sm501_set_clock(struct device *dev,
                 break;
 
         case SM501_CLOCK_V2XCLK:
-                /* This clock is divided in half so to achive the
+                /* This clock is divided in half so to achieve the
                  * requested frequency the value must be multiplied by 2. */
 
                 sm501_freq = (sm501_select_clock(2 * req_freq, &to, 3) / 2);
@@ -648,7 +648,7 @@ unsigned long sm501_find_clock(struct device *dev,
                                unsigned long req_freq)
 {
         struct sm501_devdata *sm = dev_get_drvdata(dev);
-        unsigned long sm501_freq; /* the frequency achiveable by the 501 */
+        unsigned long sm501_freq; /* the frequency achieveable by the 501 */
         struct sm501_clock to;
 
         switch (clksrc) {