linux-next: manual merge of the voltage tree with Linus' tree

[Stephen Rothwell]

Hi Liam,

Today's linux-next merge of the voltage tree got a conflict in
drivers/regulator/Makefile between commit
b07682b6056eb6701f8cb86aa5800e6f2ea7919b ("mfd: Rename twl4030* driver
files to enable re-use") from Linus' tree and commit
9c4d460f13b7d81abb26449a3920638889a3e5ed ("regulator: add driver for
MAX8660/8661") from the voltage tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/regulator/Makefile
index 9ae3cc4,2cf98a7..0000000
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -11,7 -11,8 +11,8 @@@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUM
  obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
  obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
  obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
+ obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o
 -obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
 +obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/