diff options
| author | Arnd Bergmann <[email protected]> | 2020-05-21 21:37:22 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2020-05-21 21:37:22 +0000 |
| commit | 9eddc06a3bc79402f50176703237ed045ae77b16 (patch) | |
| tree | 1db5ab96288e121ce8c449d7d60926f270f04407 /arch/powerpc/lib/code-patching.c | |
| parent | ARM: dts: mmp3: Add the fifth SD HCI (diff) | |
| parent | ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy (diff) | |
| download | kernel-9eddc06a3bc79402f50176703237ed045ae77b16.tar.gz kernel-9eddc06a3bc79402f50176703237ed045ae77b16.zip | |
Merge branch 'mmp/fixes' into arm/dt
These were queued for v5.7 as bugfixes, merge them
here as well to resolve the conflicts.
* mmp/fixes:
ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy
ARM: dts: mmp3-dell-ariel: Fix the SPI devices
ARM: dts: mmp3: Use the MMP3 compatible string for /clocks
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
0 files changed, 0 insertions, 0 deletions