tree 13e8da5dc42cc62b9721659c41045d2c27c31cc3
parent 178e43aef2979525d7864daefd9499614e13800e
parent 411a2df5090ccb88f4c3726e4951ebed579fec11
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1336817425 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1336817425 +0100

Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

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