| commit | d7718c147a89783ec3bf1735f724ca32174393dd | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Apr 19 07:02:50 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Apr 19 07:02:50 2017 -0700 |
| tree | 9e4bcf1aafcb470c9d28430baeb1a89e48c49968 | |
| parent | ab57c2b4948eb02108b26b9c3410a811bae5e352 [diff] | |
| parent | f147140c7f0350d363c10aeb51b78b65b2425266 [diff] |
Merge tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi into next/soc ARM: mach-hisi: Hisilicon SoC updates for 4.12 - Fix the error return code in hip04_smp_init * tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi: ARM: hisi: fix error return code in hip04_smp_init() Signed-off-by: Olof Johansson <olof@lixom.net>