projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 240fbe2 e3e7100)
Merge branch 'ab8500-from-Rajanikanth'
authorAnton Vorontsov <anton@enomsg.org>
Sun, 6 Jan 2013 01:35:35 +0000 (17:35 -0800)
committerAnton Vorontsov <anton@enomsg.org>
Sun, 6 Jan 2013 01:35:35 +0000 (17:35 -0800)
Conflicts:
drivers/power/ab8500_bmdata.c


Trivial merge