Age | Commit message (Collapse) | Author |
|
Conflicts:
drivers/net/Kconfig
lib/Makefile
|
|
|
|
Conflicts:
drivers/scsi/libsas/sas_ata.c
drivers/scsi/libsas/sas_scsi_host.c
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/alpha/Kconfig
arch/parisc/Kconfig
arch/sparc/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/hwmon/Makefile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
fs/logfs/logfs.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/xtensa/configs/iss_defconfig
|
|
Conflicts:
drivers/video/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|