mirror of
https://github.com/torvalds/linux.git
synced 2026-03-15 02:36:16 +01:00
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 | ||