]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4285087 07633f2)
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)
commit97d67b1c8bb08755aa7ba0ce3549fdaeccc399b7
treeb48a3ea4060a7d078aecb97de07597a8eb24467atree | snapshot
parent4285087dd1b63c1acaec8d2c5a49e7a16eaf2491commit | diff
parent07633f242a7717eccb96e2a3ddc0731e1cee5ea2commit | 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.