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

Merge branch 'ab8500-from-Rajanikanth' 

Conflicts:
	drivers/power/ab8500_bmdata.c
parents 240fbe23 e3e71007

There are no changes