Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-26 18:16:26 +00:00 · 2008-04-28 23:08:21 +00:00 · 2008-04-28 23:08:21 +00:00 · e9f20d6f03
commit e9f20d6f03
parent bf62fd887c e31a94ed37
711 changed files with 19686 additions and 11569 deletions
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/fb/gxfb.txt
+++ b/Documentation/fb/gxfb.txt
--- a/Documentation/fb/intelfb.txt
+++ b/Documentation/fb/intelfb.txt
--- a/Documentation/fb/lxfb.txt
+++ b/Documentation/fb/lxfb.txt
--- a/Documentation/fb/metronomefb.txt
+++ b/Documentation/fb/metronomefb.txt
--- a/Documentation/fb/modedb.txt
+++ b/Documentation/fb/modedb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/spi/spidev
+++ b/Documentation/spi/spidev
--- a/Documentation/spi/spidev_fdx.c
+++ b/Documentation/spi/spidev_fdx.c
--- a/Documentation/vm/numa_memory_policy.txt
+++ b/Documentation/vm/numa_memory_policy.txt
--- a/62
+++ b/62
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
--- a/arch/alpha/kernel/core_titan.c
+++ b/arch/alpha/kernel/core_titan.c
--- a/arch/alpha/kernel/core_tsunami.c
+++ b/arch/alpha/kernel/core_tsunami.c
--- a/arch/alpha/kernel/module.c
+++ b/arch/alpha/kernel/module.c
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
--- a/arch/mips/au1000/common/cputable.c
+++ b/arch/mips/au1000/common/cputable.c
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
--- a/arch/mips/au1000/common/dbg_io.c
+++ b/arch/mips/au1000/common/dbg_io.c
--- a/arch/mips/au1000/common/dma.c
+++ b/arch/mips/au1000/common/dma.c
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
--- a/arch/mips/au1000/common/puts.c
+++ b/arch/mips/au1000/common/puts.c
--- a/arch/mips/au1000/common/reset.c
+++ b/arch/mips/au1000/common/reset.c
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
--- a/arch/mips/au1000/common/sleeper.S
+++ b/arch/mips/au1000/common/sleeper.S
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
--- a/arch/mips/au1000/db1x00/board_setup.c
+++ b/arch/mips/au1000/db1x00/board_setup.c
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
--- a/arch/mips/au1000/db1x00/irqmap.c
+++ b/arch/mips/au1000/db1x00/irqmap.c
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
--- a/arch/mips/au1000/mtx-1/irqmap.c
+++ b/arch/mips/au1000/mtx-1/irqmap.c
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
--- a/arch/mips/au1000/pb1000/irqmap.c
+++ b/arch/mips/au1000/pb1000/irqmap.c
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
--- a/arch/mips/au1000/pb1100/irqmap.c
+++ b/arch/mips/au1000/pb1100/irqmap.c
--- a/arch/mips/au1000/pb1200/Makefile
+++ b/arch/mips/au1000/pb1200/Makefile
--- a/arch/mips/au1000/pb1200/board_setup.c
+++ b/arch/mips/au1000/pb1200/board_setup.c
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
--- a/arch/mips/au1000/pb1200/platform.c
+++ b/arch/mips/au1000/pb1200/platform.c
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
--- a/arch/mips/au1000/pb1500/irqmap.c
+++ b/arch/mips/au1000/pb1500/irqmap.c
--- a/arch/mips/au1000/pb1550/board_setup.c
+++ b/arch/mips/au1000/pb1550/board_setup.c
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
--- a/arch/mips/au1000/pb1550/irqmap.c
+++ b/arch/mips/au1000/pb1550/irqmap.c
--- a/arch/mips/au1000/xxs1500/board_setup.c
+++ b/arch/mips/au1000/xxs1500/board_setup.c
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
--- a/arch/mips/au1000/xxs1500/irqmap.c
+++ b/arch/mips/au1000/xxs1500/irqmap.c
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
--- a/arch/mips/configs/pnx8550-stb810_defconfig
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
--- a/arch/mips/kernel/cevt-ds1287.c
+++ b/arch/mips/kernel/cevt-ds1287.c
--- a/arch/mips/kernel/cevt-gt641xx.c
+++ b/arch/mips/kernel/cevt-gt641xx.c
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
--- a/arch/mips/kernel/csrc-ioasic.c
+++ b/arch/mips/kernel/csrc-ioasic.c
--- a/arch/mips/kernel/gpio_txx9.c
+++ b/arch/mips/kernel/gpio_txx9.c
--- a/Show more
+++ b/Show more