Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/mach-mxs/mach-mxs.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/block/Kconfig
|
|
|
|
This reverts commit 52f6317528c6877c8c5d4b2ab7a04430af99ed4a.
|
|
Conflicts:
drivers/staging/silicom/bpctl_mod.c
|
|
|
|
|
|
|
|
Conflicts:
drivers/base/cpu.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/s390/include/asm/pgtable.h
|
|
|
|
|
|
Conflicts:
Documentation/networking/netlink_mmap.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/mfd/intel_msic.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|