Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

2026-09-18 18:15:59 +00:00 · 2007-10-11 16:52:59 +10:00 · 2007-10-11 16:52:59 +10:00 · c1561cf463
commit c1561cf463
parent 053c59a0a7 bbf25010f1
98 changed files with 1343 additions and 743 deletions
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/lockstat.txt
+++ b/Documentation/lockstat.txt
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
--- a/2
+++ b/2
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/kernel/vio.c
+++ b/arch/sparc64/kernel/vio.c
--- a/arch/sparc64/lib/NGcopy_from_user.S
+++ b/arch/sparc64/lib/NGcopy_from_user.S
--- a/arch/sparc64/lib/NGcopy_to_user.S
+++ b/arch/sparc64/lib/NGcopy_to_user.S
--- a/arch/sparc64/lib/NGmemcpy.S
+++ b/arch/sparc64/lib/NGmemcpy.S
--- a/arch/x86_64/vdso/voffset.h
+++ b/arch/x86_64/vdso/voffset.h
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
--- a/fs/aio.c
+++ b/fs/aio.c
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
--- a/fs/splice.c
+++ b/fs/splice.c
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/portmux.h
+++ b/include/asm-blackfin/mach-bf537/portmux.h
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
--- a/include/asm-blackfin/portmux.h
+++ b/include/asm-blackfin/portmux.h
--- a/include/asm-blackfin/unistd.h
+++ b/include/asm-blackfin/unistd.h
--- a/include/asm-h8300/flat.h
+++ b/include/asm-h8300/flat.h
--- a/include/asm-m32r/flat.h
+++ b/include/asm-m32r/flat.h
--- a/include/asm-m68knommu/flat.h
+++ b/include/asm-m68knommu/flat.h
--- a/include/asm-mips/cmpxchg.h
+++ b/include/asm-mips/cmpxchg.h
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
--- a/include/asm-mips/local.h
+++ b/include/asm-mips/local.h
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
--- a/include/asm-sh/flat.h
+++ b/include/asm-sh/flat.h
--- a/include/asm-v850/flat.h
+++ b/include/asm-v850/flat.h
--- a/include/asm-x86_64/processor.h
+++ b/include/asm-x86_64/processor.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
--- a/include/net/rose.h
+++ b/include/net/rose.h
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
--- a/kernel/signal.c
+++ b/kernel/signal.c
--- a/kernel/sys.c
+++ b/kernel/sys.c
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
--- a/lib/Makefile
+++ b/lib/Makefile
--- a/mm/Kconfig
+++ b/mm/Kconfig
--- a/mm/filemap.c
+++ b/mm/filemap.c
--- a/mm/fremap.c
+++ b/mm/fremap.c
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
--- a/mm/memory.c
+++ b/mm/memory.c
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
--- a/net/rose/rose_loopback.c
+++ b/net/rose/rose_loopback.c
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c