Merge branch 'v2.6.36'

2026-10-16 22:39:48 +00:00 · 2010-10-21 08:29:34 -05:00 · 2010-10-21 08:29:34 -05:00 · 39dc948c69
commit 39dc948c69
parent a731cd116c f6f94e2ab1
50 changed files with 330 additions and 235 deletions
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/arch/m32r/include/asm/elf.h
+++ b/arch/m32r/include/asm/elf.h
--- a/arch/m32r/kernel/.gitignore
+++ b/arch/m32r/kernel/.gitignore
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
--- a/arch/mips/Kbuild
+++ b/arch/mips/Kbuild
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
--- a/arch/mips/dec/Platform
+++ b/arch/mips/dec/Platform
--- a/arch/mips/include/asm/fcntl.h
+++ b/arch/mips/include/asm/fcntl.h
--- a/arch/mips/jz4740/Platform
+++ b/arch/mips/jz4740/Platform
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/block/bsg.c
+++ b/block/bsg.c
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/firewire/ohci.h
+++ b/drivers/firewire/ohci.h
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
--- a/drivers/hid/hid-cando.c
+++ b/drivers/hid/hid-cando.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/include/linux/types.h
+++ b/include/linux/types.h
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
--- a/net/rds/page.c
+++ b/net/rds/page.c
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c