]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1dd782d6209b1cbb63ac5845bd73de08c7628005
treef4368560d7b74d94fe64028ead84ba9963cd3182
parentdf4921ae3e41614171ddc81ef438137a23c576e4
parent4a368432380bfeea9c226feb38240d1cddf7df41
Merge tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc2

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>