Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas

Conflicts:
	drivers/regulator/palmas-regulator.c
This commit is contained in:
Mark Brown 2013-09-17 00:34:28 +01:00
commit d0175e7e78
50 changed files with 514 additions and 1099 deletions