Merge branch 'master' into upstream

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index ed22b96580c6..01b8ac641eb8 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -156,8 +156,8 @@ static void gather_partition_info(void)
 {
         struct device_node *rootdn;
 
-        char *ppartition_name;
-        unsigned int *p_number_ptr;
+        const char *ppartition_name;
+        const unsigned int *p_number_ptr;
 
         /* Retrieve information about this partition */
         rootdn = find_path_device("/");
@@ -165,14 +165,11 @@ static void gather_partition_info(void)
                 return;
         }
 
-        ppartition_name =
-                get_property(rootdn, "ibm,partition-name", NULL);
+        ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);
         if (ppartition_name)
                 strncpy(partition_name, ppartition_name,
                                 sizeof(partition_name));
-        p_number_ptr =
-                (unsigned int *)get_property(rootdn, "ibm,partition-no",
-                                             NULL);
+        p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);
         if (p_number_ptr)
                 partition_number = *p_number_ptr;
 }