diff options
| author | Stafford Horne <shorne@gmail.com> | 2021-01-25 11:08:34 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2021-01-25 11:16:06 +0900 |
| commit | 2261352157a932717ec08b9dd18d1bfbb7c37c52 (patch) | |
| tree | b48a3ea4060a7d078aecb97de07597a8eb24467a /fs/squashfs/xattr_id.c | |
| parent | 3706f9f76a4f79f8e7b2eb8b99877e89fe9ad732 (diff) | |
| parent | 031c7a8cd6fc565e90320bf08f22ee6e70f9d969 (diff) | |
Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
Pickup fixes that went upstream already in order to resolve conflicts in
litex_soc_ctrl.c between 5.11 fixes that went upstream and the
or1k-5.12-updates linux-next queue.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'fs/squashfs/xattr_id.c')
0 files changed, 0 insertions, 0 deletions