Commit 86b1e829 authored by Anton Vorontsov's avatar Anton Vorontsov

Merge branch 'ab8500-from-Rajanikanth'

Conflicts:
	drivers/power/ab8500_bmdata.c
parents 240fbe23 e3e71007
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment