From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 8 Apr 2013 09:19:40 +0000 (+0200)
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~31^2~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5fd8516cfdd187f35c45f5f818da94aa3b42e9;p=pandora-kernel.git

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

Conflicts:
	drivers/mfd/ab8500-gpadc.c

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

8b5fd8516cfdd187f35c45f5f818da94aa3b42e9
Reading git-diff-tree failed