From: Anton Vorontsov <anton@enomsg.org>
Date: Sun, 3 Feb 2013 03:25:57 +0000 (-0800)
Subject: Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500
X-Git-Tag: v3.9-rc1~151^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a1c154d449aae97a8ecad67ddbfd4024ac8446;p=pandora-kernel.git

Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500

Pull a huge ab8500/pm2301 pile of changes from Lee Jones. Lee did an
awesome job cleaning this stuff up and thus brought ab8500 Stericsson's
development tree much closer to the mainline. Even more changes to come,
though.

Conflicts:
	drivers/power/Kconfig
---

58a1c154d449aae97a8ecad67ddbfd4024ac8446
Reading git-diff-tree failed