Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index c212694a9714..f2684dd09ed0 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -284,7 +284,7 @@ mega_query_adapter(adapter_t *adapter)
 
         adapter->host->max_id = 16;     /* max targets per channel */
 
-        adapter->host->max_lun = 7;     /* Upto 7 luns for non disk devices */
+        adapter->host->max_lun = 7;     /* Up to 7 luns for non disk devices */
 
         adapter->host->cmd_per_lun = max_cmd_per_lun;
 
@@ -3734,7 +3734,7 @@ mega_m_to_n(void __user *arg, nitioctl_t *uioc)
          * check is the application conforms to NIT. We do not have to do much
          * in that case.
          * We exploit the fact that the signature is stored in the very
-         * begining of the structure.
+         * beginning of the structure.
          */
 
         if( copy_from_user(signature, arg, 7) )