projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3706f9f 031c7a8)
Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
authorStafford Horne <shorne@gmail.com>
Mon, 25 Jan 2021 02:08:34 +0000 (11:08 +0900)
committerStafford Horne <shorne@gmail.com>
Mon, 25 Jan 2021 02:16:06 +0000 (11:16 +0900)
commit2261352157a932717ec08b9dd18d1bfbb7c37c52
treeb48a3ea4060a7d078aecb97de07597a8eb24467atree | snapshot
parent3706f9f76a4f79f8e7b2eb8b99877e89fe9ad732commit | diff
parent031c7a8cd6fc565e90320bf08f22ee6e70f9d969commit | 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>
drivers/soc/litex/litex_soc_ctrl.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository