diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-27 11:11:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-27 11:11:17 -0700 |
| commit | 9eb23c9218aac6ff4b5c2e660638a47c03f2c978 (patch) | |
| tree | f4368560d7b74d94fe64028ead84ba9963cd3182 /init | |
| parent | 9f0f10117228b73ec657aab8f303c9ae88fda070 (diff) | |
| parent | 6234ca670d5703ee4d22042e974657c57fe8364b (diff) | |
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>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions