diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:34:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:34:15 +0200 |
| commit | ecb09d40170a446dc36099dca35d569338134a5b (patch) | |
| tree | 990fcb8a15d50da27fa2c673642d6e5534505cf1 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | d4e508c298f36e7b48872cba49c81ec4f329d504 (diff) | |
| parent | bf3c4b517c2e2217e6cd53bc7a44e321bb799d75 (diff) | |
Merge tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "Rockchip soc32 changes for 4.14" from Heiko Stübner:
32bit arch changes for Rockchip socs containing enablement for ZONE_DMA
for LPAE builds due to the peripherals only being 32bit capable
and conversion to the exclusive reset controls in smp code.
* tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: enable ZONE_DMA for non 64-bit capable peripherals
ARM: rockchip: explicitly request exclusive reset control in smp code
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions