diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-05-28 22:17:49 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-28 22:17:49 +0200 |
commit | 78f7d98be7a869fd6f99c1c2abe7ce2adc3198e0 (patch) | |
tree | 4d0999f4344b915de98170c3ba5b6bd98478b980 /arch/arm64 | |
parent | 0d583273b49a2305d6f5fff668575bdbf9e85c70 (diff) | |
parent | 22e795b470aebef4c01346e3b43e0af49c7638be (diff) | |
download | linux-78f7d98be7a869fd6f99c1c2abe7ce2adc3198e0.tar.bz2 |
Merge branch 'baikal/drivers' into arm/drivers
These are mainly fixups for comments that collided with me
already merging v3 of the series, and one patch that I had forgotten
to pick up.
* baikal/drivers:
bus: bt1-axi: Build the driver into the kernel
bus: bt1-apb: Build the driver into the kernel
bus: bt1-axi: Use sysfs_streq instead of strncmp
bus: bt1-axi: Optimize the return points in the driver
bus: bt1-apb: Use sysfs_streq instead of strncmp
bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method
bus: bt1-apb: Fix show/store callback identations
bus: bt1-apb: Include linux/io.h
dt-bindings: memory: Add Baikal-T1 L2-cache Control Block binding
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64')
0 files changed, 0 insertions, 0 deletions