diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:18:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:18:43 +0100 |
| commit | 2db0aea590246b570b9352659f065727900c6f69 (patch) | |
| tree | e2c084add2bab79a1407cde49cbbc76ea036680c /drivers/vfio | |
| parent | 4eca459bc10d8400407d0fc04e90dac45b571c87 (diff) | |
| parent | 3ee851e212d0bb6be8c462059fba74ce2e3f6064 (diff) | |
Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "code part of the rk3288 smp support" from Heiko Stübner:
here is the second batch of soc related changes, consisting only
of the smp support for rk3288.
Due to the slight misheap of the v3.18 cpuclk pull being merge, it is based
on exactly this merge commit from Olof to next/soc.
* tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: add basic smp support for rk3288
ARM: rockchip: add option to access the pmu via a phandle in smp_operations
ARM: rockchip: convert to regmap and use pmu syscon if available
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/vfio')
0 files changed, 0 insertions, 0 deletions