Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Merge commit. Changes below are compared with the first parent: 6ab16d24.
Changes
162 files changed · +1718 −2046
Only the first 600 diff lines are shown. Download the complete patch.
Makefile
View filearch/arm/configs/corgi_defconfig
View filearch/arm/configs/poodle_defconfig
View before deletionThis diff is incomplete. Download the complete patch.
arch/arm/configs/spitz_defconfig
View fileThis diff is incomplete. Download the complete patch.
arch/arm/kernel/head.S
View fileThis diff is incomplete. Download the complete patch.
arch/arm/mach-pxa/Kconfig
View fileThis diff is incomplete. Download the complete patch.
arch/arm/mach-realview/core.c
View fileThis diff is incomplete. Download the complete patch.
arch/arm/mm/consistent.c
View fileThis diff is incomplete. Download the complete patch.
arch/arm/tools/mach-types
View fileThis diff is incomplete. Download the complete patch.
arch/frv/kernel/semaphore.c
View fileThis diff is incomplete. Download the complete patch.
arch/frv/mb93090-mb00/pci-irq.c
View fileThis diff is incomplete. Download the complete patch.
arch/frv/mm/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/frv/mm/pgalloc.c
View fileThis diff is incomplete. Download the complete patch.
arch/i386/kernel/io_apic.c
View fileThis diff is incomplete. Download the complete patch.
arch/i386/kernel/reboot.c
View fileThis diff is incomplete. Download the complete patch.
arch/ia64/kernel/ia64_ksyms.c
View fileThis diff is incomplete. Download the complete patch.
arch/ia64/kernel/kprobes.c
View fileThis diff is incomplete. Download the complete patch.
arch/ia64/kernel/traps.c
View fileThis diff is incomplete. Download the complete patch.
arch/m32r/kernel/io_mappi3.c
View fileThis diff is incomplete. Download the complete patch.
arch/m32r/kernel/setup_mappi3.c
View fileThis diff is incomplete. Download the complete patch.
arch/m32r/kernel/sys_m32r.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/ppc_ksyms.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/process.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/prom_init.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/vdso.c
View fileThis diff is incomplete. Download the complete patch.
arch/ppc/kernel/ppc_ksyms.c
View fileThis diff is incomplete. Download the complete patch.
arch/ppc/kernel/process.c
View fileThis diff is incomplete. Download the complete patch.
arch/sparc/mm/generic.c
View fileThis diff is incomplete. Download the complete patch.
arch/sparc64/mm/generic.c
View fileThis diff is incomplete. Download the complete patch.
drivers/atm/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/atm/Makefile
View fileThis diff is incomplete. Download the complete patch.
drivers/atm/adummy.c
View fileThis diff is incomplete. Download the complete patch.
drivers/atm/atmdev_init.c
View before deletionThis diff is incomplete. Download the complete patch.
drivers/atm/atmtcp.c
View fileThis diff is incomplete. Download the complete patch.
drivers/atm/lanai.c
View fileThis diff is incomplete. Download the complete patch.
drivers/char/mem.c
View fileThis diff is incomplete. Download the complete patch.
drivers/cpufreq/cpufreq.c
View fileThis diff is incomplete. Download the complete patch.
drivers/md/md.c
View fileThis diff is incomplete. Download the complete patch.
drivers/md/raid1.c
View fileThis diff is incomplete. Download the complete patch.
drivers/md/raid10.c
View fileThis diff is incomplete. Download the complete patch.
drivers/md/raid5.c
View fileThis diff is incomplete. Download the complete patch.
drivers/md/raid6main.c
View fileThis diff is incomplete. Download the complete patch.
drivers/media/video/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/media/video/cx88/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/media/video/cx88/Makefile
View fileThis diff is incomplete. Download the complete patch.
drivers/media/video/saa7134/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/media/video/saa7134/Makefile
View fileThis diff is incomplete. Download the complete patch.
drivers/message/fusion/mptbase.c
View fileThis diff is incomplete. Download the complete patch.
drivers/message/fusion/mptbase.h
View fileThis diff is incomplete. Download the complete patch.
drivers/mmc/mmc.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/chips/cfi_cmdset_0001.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/chips/cfi_probe.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/chips/sharp.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/devices/block2mtd.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/devices/ms02-nv.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/ftl.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/Makefile
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/ixp4xx.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/nettel.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/pci.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/physmap.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/maps/sc520cdp.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/nand/nandsim.c
View fileThis diff is incomplete. Download the complete patch.
drivers/mtd/rfd_ftl.c
View fileThis diff is incomplete. Download the complete patch.
drivers/pcmcia/m32r_cfc.c
View fileThis diff is incomplete. Download the complete patch.
drivers/scsi/megaraid.c
View fileThis diff is incomplete. Download the complete patch.
drivers/serial/8250.c
View fileThis diff is incomplete. Download the complete patch.
drivers/serial/8250_pci.c
View fileThis diff is incomplete. Download the complete patch.
drivers/serial/serial_core.c
View fileThis diff is incomplete. Download the complete patch.
drivers/serial/serial_cs.c
View fileThis diff is incomplete. Download the complete patch.
drivers/usb/atm/usbatm.c
View fileThis diff is incomplete. Download the complete patch.
drivers/video/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/video/cirrusfb.c
View fileThis diff is incomplete. Download the complete patch.
drivers/video/console/fbcon_ccw.c
View fileThis diff is incomplete. Download the complete patch.
drivers/video/console/fbcon_rotate.h
View fileThis diff is incomplete. Download the complete patch.
fs/9p/vfs_inode.c
View fileThis diff is incomplete. Download the complete patch.
fs/dquot.c
View fileThis diff is incomplete. Download the complete patch.
fs/exec.c
View fileThis diff is incomplete. Download the complete patch.
fs/ext3/resize.c
View fileThis diff is incomplete. Download the complete patch.
fs/fuse/dir.c
View fileThis diff is incomplete. Download the complete patch.
fs/hfsplus/hfsplus_fs.h
View fileThis diff is incomplete. Download the complete patch.
fs/hfsplus/hfsplus_raw.h
View fileThis diff is incomplete. Download the complete patch.
fs/hfsplus/options.c
View fileThis diff is incomplete. Download the complete patch.
fs/hfsplus/super.c
View fileThis diff is incomplete. Download the complete patch.
fs/jffs2/fs.c
View fileThis diff is incomplete. Download the complete patch.
fs/jffs2/super.c
View fileThis diff is incomplete. Download the complete patch.
fs/proc/task_mmu.c
View fileThis diff is incomplete. Download the complete patch.
fs/reiserfs/inode.c
View fileThis diff is incomplete. Download the complete patch.
fs/reiserfs/journal.c
View fileThis diff is incomplete. Download the complete patch.
include/asm-arm/arch-s3c2410/regs-gpio.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-arm/arch-sa1100/io.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-frv/hardirq.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-frv/ide.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-frv/page.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-frv/semaphore.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-frv/thread_info.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-ia64/page.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-m32r/atomic.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-m32r/ide.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-m32r/mappi3/mappi3_pld.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-m32r/system.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-sparc64/pgtable.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/atmdev.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/cn_proc.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/cpu.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/memory.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/mm.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/mmc/protocol.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/mtd/cfi.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/rmap.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/sched.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/serial_core.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/swap.h
View fileThis diff is incomplete. Download the complete patch.
kernel/cpu.c
View fileThis diff is incomplete. Download the complete patch.
kernel/fork.c
View fileThis diff is incomplete. Download the complete patch.
kernel/posix-cpu-timers.c
View fileThis diff is incomplete. Download the complete patch.
kernel/power/main.c
View fileThis diff is incomplete. Download the complete patch.
kernel/ptrace.c
View fileThis diff is incomplete. Download the complete patch.
kernel/workqueue.c
View fileThis diff is incomplete. Download the complete patch.
lib/genalloc.c
View fileThis diff is incomplete. Download the complete patch.
mm/fremap.c
View fileThis diff is incomplete. Download the complete patch.
mm/madvise.c
View fileThis diff is incomplete. Download the complete patch.
mm/memory.c
View fileThis diff is incomplete. Download the complete patch.
mm/mempolicy.c
View fileThis diff is incomplete. Download the complete patch.
mm/msync.c
View fileThis diff is incomplete. Download the complete patch.
mm/nommu.c
View fileThis diff is incomplete. Download the complete patch.
mm/page_alloc.c
View fileThis diff is incomplete. Download the complete patch.
mm/rmap.c
View fileThis diff is incomplete. Download the complete patch.
mm/thrash.c
View fileThis diff is incomplete. Download the complete patch.
mm/vmscan.c
View fileThis diff is incomplete. Download the complete patch.
net/atm/atm_misc.c
View fileThis diff is incomplete. Download the complete patch.
net/atm/common.c
View fileThis diff is incomplete. Download the complete patch.
net/atm/common.h
View fileThis diff is incomplete. Download the complete patch.
net/atm/resources.c
View fileThis diff is incomplete. Download the complete patch.
net/atm/resources.h
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/fib_hash.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/fib_semantics.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/icmp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ip_gre.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ip_output.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ipvs/ip_vs_conn.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ipvs/ip_vs_ctl.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ipvs/ip_vs_proto_tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_amanda.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_core.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_ftp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_irc.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_proto_icmp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_proto_sctp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_proto_tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_core.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_tables.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ipt_LOG.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/proc.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/route.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/addrconf.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/icmp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/ip6_output.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/ipv6_sockglue.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/ip6_tables.c
View fileThis diff is incomplete. Download the complete patch.