mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
d2e11fd2b7
Conflicting commits, all resolutions pretty trivial: drivers/bus/mhi/pci_generic.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
sis190.c | ||
sis900.c | ||
sis900.h |