From: Anton Vorontsov <anton@enomsg.org>
Date: Tue, 19 Mar 2013 02:02:58 +0000 (-0700)
Subject: Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0... 
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~93^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=441a499e5a5bf7b65ca557abd5ffc64b509dca65;p=pandora-kernel.git

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
---

441a499e5a5bf7b65ca557abd5ffc64b509dca65
Reading git-diff-tree failed