commit 10e5b0361455ab787d3b5418f6ac19c259ea1568
author Ethan Chen <intervigil@gmail.com> Thu Jun 20 11:34:12 2013 -0700
committer Ethan Chen <intervigil@gmail.com> Thu Jun 20 11:34:12 2013 -0700
tree 197834380d5bdb6801c960c59f10dd7d4711376e
parent 2ae6b9cbf57dd1f756318b7840db017478b95fc3

misc: Fix merge conflicts from 3.4.10 stable merge

* MSM8X60 should select ARM_ERRATA_720789
* SDHCI driver does not allow for tuning opcode
* Remove unused variable in ext4/resize.c

Change-Id: I2acf14e162f5b4dfa27a9bf088a2db218aeb5a99

fs/ext4/resize.c

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 3407a62..aa72ee7 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1141,7 +1141,7 @@
 	struct ext4_new_group_data *group_data = flex_gd->groups;
 	struct ext4_sb_info *sbi = EXT4_SB(sb);
 	struct ext4_super_block *es = sbi->s_es;
-	int i, ret;
+	int i;
 
 	BUG_ON(flex_gd->count == 0 || group_data == NULL);
 	/*