| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
fs/ocfs2/super.c
fs/super.c
include/linux/fs.h
mm/Kconfig
|
|
Conflicts:
drivers/usb/gadget/Kconfig
|
|
Conflicts:
drivers/tty/serial/68328serial.c
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
|
|
|
|
|
|
Conflicts:
arch/x86/kernel/vmlinux.lds.S
|
|
Conflicts:
include/linux/pci_ids.h
|
|
|
|
|
|
Conflicts:
arch/x86/kernel/acpi/sleep.c
|
|
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
|
|
Conflicts:
drivers/Makefile
include/linux/Kbuild
lib/Kconfig
|
|
|
|
Conflicts:
MAINTAINERS
|
|
|
|
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/xtensa/configs/iss_defconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/mach-ux500/cpu-db8500.c
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/mach-msm/board-msm7x27.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-qsd8x50.c
arch/arm/mach-msm/board-sapphire.c
arch/arm/mach-msm/include/mach/memory.h
|
|
|
|
|
|
|
|
|
|
|
