Merge tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:09:56 +0000 (11:09 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:09:56 +0000 (11:09 -0700)
commit535cee422778acaf701b9243cc6df24408856e8f
tree34c79967328c302f3e01a0366b52dea8161d9b85
parent3a5e23cf9e553cd32e68bf29fb5429e3e9a95467
parenta3e01e8022932a1fbfbad72058967e5da78657e5
Merge tag 'keystone-reset-driver' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/drivers

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>
drivers/power/reset/Kconfig
drivers/power/reset/Makefile