]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e9326c 25e37cc)
Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500
authorAnton Vorontsov <anton@enomsg.org>
Sun, 3 Feb 2013 03:25:57 +0000 (19:25 -0800)
committerAnton Vorontsov <anton@enomsg.org>
Sun, 3 Feb 2013 03:29:13 +0000 (19:29 -0800)
commit75b859ecd381b32979c1752f65df9405ef2f3b37
tree4d09553a369094149646e3018aa908b9e1294dbatree | snapshot
parent2e9326cc30e935540c715e246cb062bb0d2b7d7ccommit | diff
parent25e37cc102de5be7da363f77834ee31e4d69059bcommit | diff
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
drivers/power/Kconfig diff1 | diff2 | blob | history
drivers/power/Makefile diff1 | diff2 | blob | history
drivers/power/ab8500_btemp.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.