diff --git a/[refs] b/[refs]
index 1a20853d6c5c..beef7ff7b60b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b8435ff4d46dde75173da45564b0d65889dc64
+refs/heads/master: 80677c2538283678c7b2ef7ebbd653a3fa54d086
diff --git a/trunk/drivers/staging/zram/zram_drv.h b/trunk/drivers/staging/zram/zram_drv.h
index 9711d1e281f1..572c0b1551d4 100644
--- a/trunk/drivers/staging/zram/zram_drv.h
+++ b/trunk/drivers/staging/zram/zram_drv.h
@@ -70,7 +70,7 @@ struct table {
 	u16 size;	/* object size (excluding header) */
 	u8 count;	/* object ref count (not yet used) */
 	u8 flags;
-} __attribute__((aligned(4)));
+} __aligned(4);
 
 struct zram_stats {
 	u64 compr_size;		/* compressed size of pages stored */