git.onelab.eu Git - linux-2.6.git/commit

git://git.onelab.eu / linux-2.6.git / commit

author	Mark Huang <mlhuang@cs.princeton.edu>
	Fri, 30 Jul 2004 14:12:45 +0000 (14:12 +0000)
committer	Mark Huang <mlhuang@cs.princeton.edu>
	Fri, 30 Jul 2004 14:12:45 +0000 (14:12 +0000)
commit	ed54dc1279543caf10ba95fb0a1e9fa47ab6c4b4
tree	b1d2c40ced10ae1b57961da4abac739a142b5a3c	tree \| snapshot
parent	6984c962b5265e56ece6ed6436f4cd540c7bc3cd	commit \| diff

Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge conflicts and drops.

262 files changed:

CREDITS		diff \| blob \| history
Documentation/vm/hugetlbpage.txt		diff \| blob \| history
Makefile		diff \| blob \| history
arch/alpha/kernel/entry.S		diff \| blob \| history
arch/alpha/kernel/process.c		diff \| blob \| history
arch/alpha/kernel/signal.c		diff \| blob \| history
arch/ia64/kernel/entry.S		diff \| blob \| history
arch/ia64/mm/fault.c		diff \| blob \| history
arch/mips/kernel/syscall.c		diff \| blob \| history
arch/mips/kernel/sysirix.c		diff \| blob \| history
arch/ppc/Kconfig		diff \| blob \| history
arch/ppc/boot/common/misc-common.c		diff \| blob \| history
arch/ppc/boot/simple/Makefile		diff \| blob \| history
arch/ppc/boot/simple/gt64260_tty.c	[deleted file]	blob \| history
arch/ppc/boot/simple/head.S		diff \| blob \| history
arch/ppc/boot/simple/misc-ev64260.S		diff \| blob \| history
arch/ppc/boot/simple/misc.c		diff \| blob \| history
arch/ppc/configs/ev64260_defconfig		diff \| blob \| history
arch/ppc/kernel/syscalls.c		diff \| blob \| history
arch/ppc/platforms/Makefile		diff \| blob \| history
arch/ppc/platforms/ev64260.h		diff \| blob \| history
arch/ppc/platforms/ev64260_setup.c	[deleted file]	blob \| history
arch/ppc/syslib/Makefile		diff \| blob \| history
arch/ppc/syslib/gt64260_pic.c		diff \| blob \| history
arch/ppc/syslib/open_pic.c		diff \| blob \| history
arch/ppc64/kernel/sys_ppc32.c		diff \| blob \| history
arch/sparc/kernel/sys_sparc.c		diff \| blob \| history
arch/sparc64/kernel/sys_sparc.c		diff \| blob \| history
arch/um/drivers/stdio_console.c		diff \| blob \| history
arch/um/include/sysdep-i386/checksum.h		diff \| blob \| history
arch/um/kernel/syscall_kern.c		diff \| blob \| history
arch/um/sys-i386/Makefile		diff \| blob \| history
arch/x86_64/ia32/ia32entry.S		diff \| blob \| history
arch/x86_64/ia32/sys_ia32.c		diff \| blob \| history
arch/x86_64/kernel/sys_x86_64.c		diff \| blob \| history
drivers/mtd/Kconfig		diff \| blob \| history
drivers/mtd/Makefile		diff \| blob \| history
drivers/mtd/afs.c		diff \| blob \| history
drivers/mtd/chips/Kconfig		diff \| blob \| history
drivers/mtd/chips/Makefile		diff \| blob \| history
drivers/mtd/chips/amd_flash.c		diff \| blob \| history
drivers/mtd/chips/cfi_cmdset_0001.c		diff \| blob \| history
drivers/mtd/chips/cfi_cmdset_0002.c		diff \| blob \| history
drivers/mtd/chips/cfi_cmdset_0020.c		diff \| blob \| history
drivers/mtd/chips/cfi_probe.c		diff \| blob \| history
drivers/mtd/chips/chipreg.c		diff \| blob \| history
drivers/mtd/chips/gen_probe.c		diff \| blob \| history
drivers/mtd/chips/jedec.c		diff \| blob \| history
drivers/mtd/chips/jedec_probe.c		diff \| blob \| history
drivers/mtd/chips/map_ram.c		diff \| blob \| history
drivers/mtd/chips/map_rom.c		diff \| blob \| history
drivers/mtd/chips/sharp.c		diff \| blob \| history
drivers/mtd/cmdlinepart.c		diff \| blob \| history
drivers/mtd/devices/Kconfig		diff \| blob \| history
drivers/mtd/devices/Makefile		diff \| blob \| history
drivers/mtd/devices/blkmtd.c		diff \| blob \| history
drivers/mtd/devices/doc2000.c		diff \| blob \| history
drivers/mtd/devices/doc2001.c		diff \| blob \| history
drivers/mtd/devices/doc2001plus.c		diff \| blob \| history
drivers/mtd/devices/docprobe.c		diff \| blob \| history
drivers/mtd/devices/lart.c		diff \| blob \| history
drivers/mtd/devices/ms02-nv.c		diff \| blob \| history
drivers/mtd/devices/ms02-nv.h		diff \| blob \| history
drivers/mtd/devices/pmc551.c		diff \| blob \| history
drivers/mtd/ftl.c		diff \| blob \| history
drivers/mtd/inftlcore.c		diff \| blob \| history
drivers/mtd/inftlmount.c		diff \| blob \| history
drivers/mtd/maps/Kconfig		diff \| blob \| history
drivers/mtd/maps/Makefile		diff \| blob \| history
drivers/mtd/maps/amd76xrom.c		diff \| blob \| history
drivers/mtd/maps/arctic-mtd.c		diff \| blob \| history
drivers/mtd/maps/autcpu12-nvram.c		diff \| blob \| history
drivers/mtd/maps/beech-mtd.c		diff \| blob \| history
drivers/mtd/maps/cdb89712.c		diff \| blob \| history
drivers/mtd/maps/ceiva.c		diff \| blob \| history
drivers/mtd/maps/cfi_flagadm.c		diff \| blob \| history
drivers/mtd/maps/cstm_mips_ixx.c		diff \| blob \| history
drivers/mtd/maps/dbox2-flash.c		diff \| blob \| history
drivers/mtd/maps/dc21285.c		diff \| blob \| history
drivers/mtd/maps/dilnetpc.c		diff \| blob \| history
drivers/mtd/maps/ebony.c		diff \| blob \| history
drivers/mtd/maps/edb7312.c		diff \| blob \| history
drivers/mtd/maps/elan-104nc.c		diff \| blob \| history
drivers/mtd/maps/epxa10db-flash.c		diff \| blob \| history
drivers/mtd/maps/fortunet.c		diff \| blob \| history
drivers/mtd/maps/h720x-flash.c		diff \| blob \| history
drivers/mtd/maps/impa7.c		diff \| blob \| history
drivers/mtd/maps/integrator-flash.c		diff \| blob \| history
drivers/mtd/maps/iq80310.c		diff \| blob \| history
drivers/mtd/maps/l440gx.c		diff \| blob \| history
drivers/mtd/maps/lasat.c		diff \| blob \| history
drivers/mtd/maps/lubbock-flash.c		diff \| blob \| history
drivers/mtd/maps/map_funcs.c		diff \| blob \| history
drivers/mtd/maps/mbx860.c		diff \| blob \| history
drivers/mtd/maps/netsc520.c		diff \| blob \| history
drivers/mtd/maps/nettel.c		diff \| blob \| history
drivers/mtd/maps/ocelot.c		diff \| blob \| history
drivers/mtd/maps/octagon-5066.c		diff \| blob \| history
drivers/mtd/maps/pb1xxx-flash.c		diff \| blob \| history
drivers/mtd/maps/pci.c		diff \| blob \| history
drivers/mtd/maps/pcmciamtd.c		diff \| blob \| history
drivers/mtd/maps/physmap.c		diff \| blob \| history
drivers/mtd/maps/pnc2000.c		diff \| blob \| history
drivers/mtd/maps/redwood.c		diff \| blob \| history
drivers/mtd/maps/rpxlite.c		diff \| blob \| history
drivers/mtd/maps/sa1100-flash.c		diff \| blob \| history
drivers/mtd/maps/sbc_gxx.c		diff \| blob \| history
drivers/mtd/maps/sc520cdp.c		diff \| blob \| history
drivers/mtd/maps/scb2_flash.c		diff \| blob \| history
drivers/mtd/maps/scx200_docflash.c		diff \| blob \| history
drivers/mtd/maps/solutionengine.c		diff \| blob \| history
drivers/mtd/maps/sun_uflash.c		diff \| blob \| history
drivers/mtd/maps/tqm8xxl.c		diff \| blob \| history
drivers/mtd/maps/tsunami_flash.c		diff \| blob \| history
drivers/mtd/maps/uclinux.c		diff \| blob \| history
drivers/mtd/maps/vmax301.c		diff \| blob \| history
drivers/mtd/maps/wr_sbc82xx_flash.c		diff \| blob \| history
drivers/mtd/mtd_blkdevs.c		diff \| blob \| history
drivers/mtd/mtdblock.c		diff \| blob \| history
drivers/mtd/mtdchar.c		diff \| blob \| history
drivers/mtd/mtdconcat.c		diff \| blob \| history
drivers/mtd/mtdcore.c		diff \| blob \| history
drivers/mtd/mtdpart.c		diff \| blob \| history
drivers/mtd/nand/Kconfig		diff \| blob \| history
drivers/mtd/nand/Makefile		diff \| blob \| history
drivers/mtd/nand/autcpu12.c		diff \| blob \| history
drivers/mtd/nand/edb7312.c		diff \| blob \| history
drivers/mtd/nand/nand.c	[deleted file]	blob \| history
drivers/mtd/nand/nand_ecc.c		diff \| blob \| history
drivers/mtd/nand/nand_ids.c		diff \| blob \| history
drivers/mtd/nand/spia.c		diff \| blob \| history
drivers/mtd/nftlcore.c		diff \| blob \| history
drivers/mtd/nftlmount.c		diff \| blob \| history
drivers/mtd/redboot.c		diff \| blob \| history
drivers/net/Kconfig		diff \| blob \| history
drivers/net/Makefile		diff \| blob \| history
drivers/serial/Kconfig		diff \| blob \| history
drivers/serial/Makefile		diff \| blob \| history
fs/Kconfig		diff \| blob \| history
fs/Makefile		diff \| blob \| history
fs/attr.c		diff \| blob \| history
fs/binfmt_aout.c		diff \| blob \| history
fs/binfmt_elf.c		diff \| blob \| history
fs/exec.c		diff \| blob \| history
fs/ext2/balloc.c		diff \| blob \| history
fs/ext2/ialloc.c		diff \| blob \| history
fs/ext2/inode.c		diff \| blob \| history
fs/ext2/xattr.c		diff \| blob \| history
fs/ext3/balloc.c		diff \| blob \| history
fs/ext3/ialloc.c		diff \| blob \| history
fs/ext3/inode.c		diff \| blob \| history
fs/ext3/ioctl.c		diff \| blob \| history
fs/ext3/super.c		diff \| blob \| history
fs/ext3/xattr.c		diff \| blob \| history
fs/inode.c		diff \| blob \| history
fs/jffs2/Makefile		diff \| blob \| history
fs/jffs2/background.c		diff \| blob \| history
fs/jffs2/build.c		diff \| blob \| history
fs/jffs2/compr.c		diff \| blob \| history
fs/jffs2/compr_rtime.c		diff \| blob \| history
fs/jffs2/compr_rubin.c		diff \| blob \| history
fs/jffs2/compr_zlib.c		diff \| blob \| history
fs/jffs2/erase.c		diff \| blob \| history
fs/jffs2/file.c		diff \| blob \| history
fs/jffs2/fs.c		diff \| blob \| history
fs/jffs2/gc.c		diff \| blob \| history
fs/jffs2/ioctl.c		diff \| blob \| history
fs/jffs2/malloc.c		diff \| blob \| history
fs/jffs2/nodelist.c		diff \| blob \| history
fs/jffs2/nodelist.h		diff \| blob \| history
fs/jffs2/nodemgmt.c		diff \| blob \| history
fs/jffs2/os-linux.h		diff \| blob \| history
fs/jffs2/read.c		diff \| blob \| history
fs/jffs2/readinode.c		diff \| blob \| history
fs/jffs2/scan.c		diff \| blob \| history
fs/jffs2/super.c		diff \| blob \| history
fs/jffs2/symlink.c		diff \| blob \| history
fs/jffs2/wbuf.c		diff \| blob \| history
fs/jffs2/write.c		diff \| blob \| history
fs/jffs2/writev.c		diff \| blob \| history
fs/nfs/dir.c		diff \| blob \| history
fs/nfs/inode.c		diff \| blob \| history
fs/nfs/nfs3xdr.c		diff \| blob \| history
fs/nfs/nfsroot.c		diff \| blob \| history
fs/nfs/proc.c		diff \| blob \| history
fs/nfsd/auth.c		diff \| blob \| history
fs/nfsd/nfs3xdr.c		diff \| blob \| history
fs/nfsd/nfs4xdr.c		diff \| blob \| history
fs/nfsd/nfsxdr.c		diff \| blob \| history
fs/nfsd/vfs.c		diff \| blob \| history
fs/open.c		diff \| blob \| history
fs/proc/array.c		diff \| blob \| history
fs/proc/base.c		diff \| blob \| history
fs/reiserfs/super.c		diff \| blob \| history
fs/stat.c		diff \| blob \| history
fs/xfs/linux-2.6/xfs_ioctl.c		diff \| blob \| history
fs/xfs/linux-2.6/xfs_iops.c		diff \| blob \| history
fs/xfs/linux-2.6/xfs_super.c		diff \| blob \| history
fs/xfs/linux-2.6/xfs_vnode.c		diff \| blob \| history
include/asm-generic/tlb.h		diff \| blob \| history
include/asm-ppc/gt64260.h	[deleted file]	blob \| history
include/asm-ppc/gt64260_defs.h	[deleted file]	blob \| history
include/asm-ppc/ocp_ids.h		diff \| blob \| history
include/asm-ppc/serial.h		diff \| blob \| history
include/asm-um/mmu_context.h		diff \| blob \| history
include/asm-x86_64/unistd.h		diff \| blob \| history
include/linux/binfmts.h		diff \| blob \| history
include/linux/cpumask.h		diff \| blob \| history
include/linux/ext3_fs.h		diff \| blob \| history
include/linux/fs.h		diff \| blob \| history
include/linux/jffs2.h		diff \| blob \| history
include/linux/jffs2_fs_i.h		diff \| blob \| history
include/linux/libata.h		diff \| blob \| history
include/linux/mtd/cfi.h		diff \| blob \| history
include/linux/mtd/doc2000.h		diff \| blob \| history
include/linux/mtd/flashchip.h		diff \| blob \| history
include/linux/mtd/ftl.h		diff \| blob \| history
include/linux/mtd/gen_probe.h		diff \| blob \| history
include/linux/mtd/inftl.h		diff \| blob \| history
include/linux/mtd/map.h		diff \| blob \| history
include/linux/mtd/mtd.h		diff \| blob \| history
include/linux/mtd/nand.h		diff \| blob \| history
include/linux/mtd/nand_ecc.h		diff \| blob \| history
include/linux/mtd/nftl.h		diff \| blob \| history
include/linux/mtd/partitions.h		diff \| blob \| history
include/linux/nfs_mount.h		diff \| blob \| history
include/linux/ninline.h	[deleted file]	blob \| history
include/linux/reiserfs_fs_sb.h		diff \| blob \| history
include/linux/serialP.h		diff \| blob \| history
include/linux/serial_core.h		diff \| blob \| history
include/linux/stat.h		diff \| blob \| history
include/linux/tcp.h		diff \| blob \| history
include/linux/vinline.h	[deleted file]	blob \| history
include/net/route.h		diff \| blob \| history
include/net/sock.h		diff \| blob \| history
init/Kconfig		diff \| blob \| history
init/main.c		diff \| blob \| history
ipc/util.c		diff \| blob \| history
kernel/exit.c		diff \| blob \| history
kernel/fork.c		diff \| blob \| history
kernel/sched.c		diff \| blob \| history
kernel/sys.c		diff \| blob \| history
kernel/vserver/context.c		diff \| blob \| history
kernel/vserver/dlimit.c		diff \| blob \| history
kernel/vserver/network.c		diff \| blob \| history
mm/memory.c		diff \| blob \| history
mm/mlock.c		diff \| blob \| history
mm/mmap.c		diff \| blob \| history
mm/mremap.c		diff \| blob \| history
mm/shmem.c		diff \| blob \| history
mm/swapfile.c		diff \| blob \| history
net/core/dev.c		diff \| blob \| history
net/core/sock.c		diff \| blob \| history
net/ipv4/af_inet.c		diff \| blob \| history
net/ipv4/icmp.c		diff \| blob \| history
net/ipv4/raw.c		diff \| blob \| history
net/ipv4/tcp.c		diff \| blob \| history
net/ipv4/tcp_minisocks.c		diff \| blob \| history
net/sunrpc/auth.c		diff \| blob \| history
net/sunrpc/auth_unix.c		diff \| blob \| history
net/unix/af_unix.c		diff \| blob \| history
scripts/reference_init.pl		diff \| blob \| history

linux-2.6

RSS Atom