| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Conflicts:
fs/ocfs2/super.c
fs/super.c
include/linux/fs.h
mm/Kconfig
|
|
Conflicts:
arch/powerpc/kernel/setup_64.c
drivers/scsi/pm8001/pm8001_sas.h
drivers/staging/stradis/Kconfig
fs/nfsd/nfs4state.c
include/linux/hardirq.h
include/linux/smp_lock.h
|
|
|
|
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/include/asm/xen/page.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:
drivers/leds/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
