tree 4d09553a369094149646e3018aa908b9e1294dba
parent eeb0751c99522a4d1bbcc7b6bc1460cd07d07488
parent 34c11a709e928090cf34ecd706f7d3170f4e5026
author Anton Vorontsov <anton@enomsg.org> 1359861957 -0800
committer Anton Vorontsov <anton@enomsg.org> 1359862153 -0800

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