]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh...
authorOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:11:17 +0000 (11:11 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:11:17 +0000 (11:11 -0700)
Merge "Keystone SOC updates part2 for 3.16" from Santosh Shilimkar:

- Removal of now un-necessary reset machine code
- dts updates for keystone reset driver

* tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: configs: keystone: enable reset driver support
  ARM: dts: keystone: update reset node to work with reset driver
  ARM: keystone: remove redundant reset stuff

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

Trivial merge