From: Anton Vorontsov <anton@enomsg.org>
Date: Sun, 6 Jan 2013 01:35:35 +0000 (-0800)
Subject: Merge branch 'ab8500-from-Rajanikanth'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86b1e8294e5b99cfe39f8b801d644317e108c7e5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'ab8500-from-Rajanikanth'

Conflicts:
	drivers/power/ab8500_bmdata.c
---

86b1e8294e5b99cfe39f8b801d644317e108c7e5