| 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
mm/truncate.c
|
|
|
|
Conflicts:
drivers/tty/hvc/hvc_xen.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
MAINTAINERS
arch/x86/Kconfig
drivers/Makefile
include/linux/Kbuild
lib/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/leds/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/mach-omap2/devices.c
drivers/staging/Kconfig
drivers/staging/easycap/easycap_ioctl.c
|
|
|
|
|
|
Conflicts:
arch/arm/mach-pxa/tosa.c
drivers/i2c/busses/i2c-pxa.c
|
|
|
|
|
|
Conflicts:
fs/logfs/logfs.h
|
|
|
|
Conflicts:
fs/ecryptfs/ecryptfs_kernel.h
|
|
|
|
|
|
Conflicts:
arch/xtensa/configs/iss_defconfig
|
|
|
|
|
|
|
|
|
|
|
