diff --git a/[refs] b/[refs]
index 5c269f5dd78c..238de1a00d44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b42dc44afca902d19f86d541cbb665f31b9149a0
+refs/heads/master: 93873bcbd16f7233dd5a20280af8e5394e702a8b
diff --git a/trunk/arch/arm/mach-msm/smd_private.h b/trunk/arch/arm/mach-msm/smd_private.h
index 5a8831cc41ee..2da758e65025 100644
--- a/trunk/arch/arm/mach-msm/smd_private.h
+++ b/trunk/arch/arm/mach-msm/smd_private.h
@@ -269,7 +269,7 @@ struct smd_half_channel {
 	unsigned char fUNUSED;
 	unsigned tail;
 	unsigned head;
-} __attribute__((packed));
+} __attribute__(( aligned(4), packed ));
 
 struct smd_shared_v1 {
 	struct smd_half_channel ch0;