Merge branch 'master' into for-next

Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes.  As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.

Conflicts:
	arch/alpha/include/asm/percpu.h
	arch/mn10300/kernel/vmlinux.lds.S
	include/linux/percpu-defs.h

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 20e0b447e8e8..55ff25244af4 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -3518,7 +3518,7 @@ retry_page:
                 } else
                         mptsas_volume_delete(ioc, sas_info->fw.id);
         }
-        mutex_lock(&ioc->sas_device_info_mutex);
+        mutex_unlock(&ioc->sas_device_info_mutex);
 
         /* expanders */
         mutex_lock(&ioc->sas_topology_mutex);
@@ -3549,7 +3549,7 @@ retry_page:
                         goto redo_expander_scan;
                 }
         }
-        mutex_lock(&ioc->sas_topology_mutex);
+        mutex_unlock(&ioc->sas_topology_mutex);
 }
 
 /**