CVSROOT: /home/cvs
Module name: linux
Changes by: ralf@ftp.linux-mips.org 05/06/18 15:42:52
Modified files:
. : CREDITS MAINTAINERS Makefile
Documentation : SubmittingPatches
Documentation/networking: vortex.txt
arch/arm : Kconfig
arch/arm/boot/compressed: head-xscale.S
arch/arm/configs: badge4_defconfig h3600_defconfig
hackkit_defconfig
arch/arm/kernel: entry-armv.S traps.c
arch/arm/lib : io-writesw-armv4.S
arch/arm/mach-integrator: integrator_cp.c
arch/arm/mach-pxa: lubbock.c mainstone.c pm.c pxa25x.c pxa27x.c
arch/arm/mach-s3c2410: dma.c
arch/arm/mach-sa1100: Kconfig
arch/arm/mach-versatile: core.c
arch/arm/mm : Kconfig Makefile
arch/i386/kernel: Makefile apm.c
arch/ia64/kernel: fsys.S module.c ptrace.c setup.c traps.c
arch/ia64/mm : init.c
arch/ia64/sn/kernel: setup.c
arch/m68k : defconfig
arch/m68k/configs: amiga_defconfig apollo_defconfig
atari_defconfig bvme6000_defconfig
hp300_defconfig mac_defconfig
mvme147_defconfig mvme16x_defconfig
q40_defconfig sun3_defconfig sun3x_defconfig
arch/mips : defconfig
arch/mips/configs: atlas_defconfig capcella_defconfig
cobalt_defconfig db1000_defconfig
db1100_defconfig db1500_defconfig
db1550_defconfig ddb5476_defconfig
ddb5477_defconfig e55_defconfig
ev64120_defconfig ev96100_defconfig
ip22_defconfig ip27_defconfig ip32_defconfig
it8172_defconfig ivr_defconfig
jaguar-atx_defconfig jmr3927_defconfig
lasat200_defconfig malta_defconfig
mpc30x_defconfig ocelot_3_defconfig
ocelot_c_defconfig ocelot_defconfig
ocelot_g_defconfig pb1100_defconfig
pb1500_defconfig pb1550_defconfig
rm200_defconfig sb1250-swarm_defconfig
sead_defconfig tb0226_defconfig
tb0229_defconfig workpad_defconfig
yosemite_defconfig
arch/ppc/kernel: cputable.c misc.S
arch/ppc/platforms: pmac_cpufreq.c
arch/ppc64 : defconfig
arch/ppc64/boot: prom.c
arch/ppc64/configs: g5_defconfig iSeries_defconfig
maple_defconfig pSeries_defconfig
arch/ppc64/kernel: kprobes.c misc.S sys_ppc32.c syscalls.c
arch/um : Kconfig_char
arch/um/drivers: Makefile chan_user.c mmapper_kern.c net_user.c
slip.h slip_kern.c slip_user.c slirp.h
slirp_kern.c slirp_user.c stderr_console.c
arch/um/include: mconsole.h net_user.h os.h user_util.h
arch/um/include/sysdep-i386: ptrace.h
arch/um/kernel : main.c process.c um_arch.c
arch/um/kernel/skas: process_kern.c
arch/um/os-Linux: elf_aux.c file.c
arch/um/scripts: Makefile.rules
arch/x86_64/kernel: aperture.c
drivers/block : cfq-iosched.c elevator.c ub.c
drivers/char : mxser.c
drivers/char/agp: agp.h ali-agp.c amd-k7-agp.c amd64-agp.c
ati-agp.c backend.c efficeon-agp.c generic.c
hp-agp.c i460-agp.c intel-agp.c sgi-agp.c
sworks-agp.c uninorth-agp.c
drivers/char/drm: drm_pciids.h radeon_irq.c
drivers/ieee1394: sbp2.c
drivers/input/keyboard: atkbd.c
drivers/input/mouse: alps.c
drivers/macintosh: via-pmu.c
drivers/md : dm-mpath.c
drivers/message/i2o: i2o_block.c
drivers/net : iseries_veth.c r8169.c tg3.c
drivers/net/irda: Kconfig
drivers/pci : pci-driver.c pci.ids probe.c quirks.c
drivers/pci/hotplug: cpci_hotplug_core.c cpci_hotplug_pci.c
drivers/scsi : Kconfig libata-core.c sata_sil.c
drivers/serial : sa1100.c
drivers/usb/host: ehci-hub.c
drivers/usb/media/pwc: pwc-if.c
drivers/usb/net: kaweth.c
drivers/usb/serial: ftdi_sio.c
drivers/video : fbsysfs.c macmodes.c
drivers/video/aty: radeon_base.c
fs : binfmt_elf.c binfmt_flat.c namei.c
fs/cifs : CHANGES cifsfs.h file.c inode.c
fs/nfs : dir.c file.c
include/asm-alpha: agp.h
include/asm-arm: elf.h
include/asm-arm/arch-integrator: platform.h
include/asm-arm/arch-ixp2000: io.h
include/asm-arm/arch-pxa: pxa-regs.h
include/asm-arm/arch-versatile: platform.h
include/asm-arm26: elf.h signal.h
include/asm-h8300: kmap_types.h mman.h
include/asm-i386: agp.h
include/asm-i386/mach-numaq: mach_ipi.h
include/asm-ia64: agp.h pgtable.h processor.h
include/asm-ppc: agp.h sigcontext.h
include/asm-ppc64: agp.h elf.h
include/asm-sparc: uaccess.h
include/asm-sparc64: agp.h
include/asm-x86_64: agp.h
include/linux : acpi.h if_tr.h pci_ids.h signal.h sysctl.h
include/linux/tc_ematch: tc_em_meta.h
include/net : ip.h
kernel : exit.c posix-timers.c sched.c
mm : filemap.c
net/core : dev.c ethtool.c net-sysfs.c
net/ipv4 : af_inet.c icmp.c multipath_drr.c
multipath_random.c multipath_rr.c
multipath_wrandom.c sysctl_net_ipv4.c tcp.c
net/ipv4/netfilter: ip_conntrack_standalone.c ipt_recent.c
net/ipv6 : addrconf.c icmp.c ip6_tunnel.c
net/sched : Kconfig act_api.c cls_basic.c em_meta.c
net/sctp : input.c ipv6.c proc.c protocol.c socket.c
sound/usb : usbaudio.c
sound/usb/usx2y: usbusx2y.c
Added files:
arch/arm/mm : copypage-xscale.c
arch/um/drivers: slip_common.c slip_common.h
Removed files:
arch/arm/mm : copypage-xscale.S minicache.c
arch/um/drivers: slip_proto.h
Log message:
Merge with 2.6.12.
|