tree b3e44515085c6d52747f25d57fa63e915b569c29
parent c10a002a2b4af557730e71591c529fbdf355433f
parent 0848c94fb4a5cc213a7fb0fb3a5721ad6e16f096
author Anton Vorontsov <anton.vorontsov@linaro.org> 1348539008 -0700
committer Anton Vorontsov <anton.vorontsov@linaro.org> 1348539121 -0700

Merge with upstream to accommodate with MFD changes

commit 0848c94fb4 ("mfd: core: Push irqdomain mapping out into devices")
that appeared in v3.6-rc6 adds another argument to the mfd_add_devices()
call, and that makes commit a830d28b48bf ("power_supply: Enable
battery-charger for 88pm860x", which is battery tree) no longer compatible
with the latest kernels.

This commit is used to merge upstream back into battery tree and
accommodate 88pm860x driver for the latest changes in MFD core.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reported-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>