tree 4ea91d43d10521b466e8ea19db3b5e498e7c07fd
parent a937536b868b8369b98967929045f1df54234323
parent b09f86dbfc20d9420dac43dba016cb65b582c983
author Anton Vorontsov <anton@enomsg.org> 1363658578 -0700
committer Anton Vorontsov <anton@enomsg.org> 1363658578 -0700

Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0-ux500

From Lee Jones <lee.jones@linaro.org>:

"Please find the next instalment of the AB8500 Power drivers upgrade. A lot of
work has taken place on the internal development track, but little effort has
gone into mainlining it. There is a large backlog of patches which are in need
of forward-porting, then upstreaming. This patch-set aims to make a large dent
into them."

Conflicts:
	drivers/mfd/ab8500-gpadc.c