5949a7e9ab
Conflicts: drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
Conflicts: drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)