mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-23 22:34:21 +08:00
a3314262ee
Merge our fixes branch into next. That lets us resolve a conflict in arch/powerpc/sysdev/xive/common.c. Between |
||
---|---|---|
.. | ||
common.c | ||
Kconfig | ||
Makefile | ||
native.c | ||
spapr.c | ||
xive-internal.h |