projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eeb0751 34c11a7)
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)
commit58a1c154d449aae97a8ecad67ddbfd4024ac8446
tree4d09553a369094149646e3018aa908b9e1294dbatree | snapshot (tar.gz zip)
parenteeb0751c99522a4d1bbcc7b6bc1460cd07d07488commit | diff
parent34c11a709e928090cf34ecd706f7d3170f4e5026commit | 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