Subject: linux-next: manual merge of the arm-soc tree with the regulator tree

From: [email-masked] (Mark Brown)
Date: Fri, 9 Mar 2012 12:23:59 +0000

On Fri, Mar 09, 2012 at 06:17:55PM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/regulator/Makefile between commit 8aa1ab9219e7 ("regulator: Sort
> Kconfig and Makefile entries") from the regulator tree and commit
> 8a16a701ad78 ("regulator: Remove bq24022 regulator driver") from the
> arm-soc tree.

Both fixups look good, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120309/6da738e5/attachment-0001.sig>