Merge "leds: qpnp-flash-v2: Fix strobe control settings"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 2 Nov 2016 21:41:37 +0000 (14:41 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 2 Nov 2016 21:41:37 +0000 (14:41 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 2 Nov 2016 21:41:37 +0000 (14:41 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 2 Nov 2016 21:41:37 +0000 (14:41 -0700)
diff --cc drivers/leds/leds-qpnp-flash-v2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 2 Nov 2016 21:41:37 +0000 (14:41 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 2 Nov 2016 21:41:37 +0000 (14:41 -0700)