]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: acbda46 4061e03)
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)
commite12c1e0fb1114f1dac7d14584de501b08b045404
treeb48a3ea4060a7d078aecb97de07597a8eb24467atree | snapshot
parentacbda4667c10b47384ae6d3818b845bc2583b595commit | diff
parent4061e033eaca81379b06e5395386006783bc296fcommit | 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
Linux Kernel Source Tree.