linux-next: manual merge of the pinctrl tree with the battery tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 0ed5107fa860
("ab8500-charger: Do not touch VBUSOVV bits") from the battery tree and
commit 56813f798e8c ("mfd: ab8500: update header file and version
detection") from the pinctrl tree.

I fixed it up (the former is a subset of the latter) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpuUQmeO0gUY.pgp
Description: PGP signature