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

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 62ddf5202b79..2a4c566456e7 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -373,7 +373,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 rq->rc = ccw_device_start(rp->cdev, &rq->ccw,
                                           (unsigned long) rq, 0, 0);
                 if (rq->rc == 0)
-                        return; /* Sucessfully restarted. */
+                        return; /* Successfully restarted. */
                 break;
         case RAW3270_IO_STOP:
                 if (!rq)
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index ec88c59842e3..f6d72e1f2a38 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -196,7 +196,7 @@ __sclp_start_request(struct sclp_req *req)
         req->start_count++;
 
         if (rc == 0) {
-                /* Sucessfully started request */
+                /* Successfully started request */
                 req->status = SCLP_REQ_RUNNING;
                 sclp_running_state = sclp_running_state_running;
                 __sclp_set_request_timer(SCLP_RETRY_INTERVAL * HZ,