Merge tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "Keystone Reset driver for 3.16" from Santosh Shilimkar:

* tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  power: reset: keystone-reset: introduce keystone reset driver
  Documentation: dt: add bindings for keystone pll control controller
  Documentation: dt: add bindings for keystone reset driver

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc drivers/power/reset/Kconfig
Simple merge

diff --cc drivers/power/reset/Makefile
index 950fdc011c7a6cc9aa784eee4f25c49e4d4abb49,802a420741ab42f6d229e770571094586be4246b..618541b70207bbc21887bc021e8f2227aa088a45
--- 1/drivers/power/reset/Makefile
--- 2/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@@ -3,6 -3,6 +3,7 @@@ obj-$(CONFIG_POWER_RESET_GPIO) += gpio-
  obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
  obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
  obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
 +obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o
  obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
  obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
+ obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o